From 9ebc5e6afba6deb485647159c2a4927cec62a480 Mon Sep 17 00:00:00 2001 From: udeved Date: Thu, 29 Sep 2016 22:18:33 +0200 Subject: [PATCH] remove schemas; now packaged in calamares-tools --- Makefile | 34 -------------------- data/schemas/bootloader.schema.yaml | 15 --------- data/schemas/chrootcfg.schema.yaml | 14 -------- data/schemas/displaymanager.schema.yaml | 13 -------- data/schemas/finished.schema.yaml | 6 ---- data/schemas/fstab.schema.yaml | 16 --------- data/schemas/grubcfg.schema.yaml | 12 ------- data/schemas/initcpio.schema.yaml | 4 --- data/schemas/keyboard.schema.yaml | 5 --- data/schemas/license.schema.yaml | 14 -------- data/schemas/locale.schema.yaml | 7 ---- data/schemas/luksopenswaphookcfg.schema.yaml | 4 --- data/schemas/machineid.schema.yaml | 6 ---- data/schemas/mhwdcfg.schema.yaml | 21 ------------ data/schemas/mount.schema.yaml | 21 ------------ data/schemas/netgroups.schema.yaml | 14 -------- data/schemas/netinstall.schema.yaml | 4 --- data/schemas/packages.schema.yaml | 21 ------------ data/schemas/partition.schema.yaml | 8 ----- data/schemas/plymouthcfg.schema.yaml | 4 --- data/schemas/postcfg.schema.yaml | 13 -------- data/schemas/removeuser.schema.yaml | 4 --- data/schemas/services.schema.yaml | 24 -------------- data/schemas/servicescfg.schema.yaml | 20 ------------ data/schemas/settings.schema.yaml | 32 ------------------ data/schemas/umount.schema.yaml | 5 --- data/schemas/unpackfs.schema.yaml | 11 ------- data/schemas/users.schema.yaml | 13 -------- data/schemas/welcome.schema.yaml | 21 ------------ lib/util-yaml.sh | 3 +- 30 files changed, 2 insertions(+), 387 deletions(-) delete mode 100644 data/schemas/bootloader.schema.yaml delete mode 100644 data/schemas/chrootcfg.schema.yaml delete mode 100644 data/schemas/displaymanager.schema.yaml delete mode 100644 data/schemas/finished.schema.yaml delete mode 100644 data/schemas/fstab.schema.yaml delete mode 100644 data/schemas/grubcfg.schema.yaml delete mode 100644 data/schemas/initcpio.schema.yaml delete mode 100644 data/schemas/keyboard.schema.yaml delete mode 100644 data/schemas/license.schema.yaml delete mode 100644 data/schemas/locale.schema.yaml delete mode 100644 data/schemas/luksopenswaphookcfg.schema.yaml delete mode 100644 data/schemas/machineid.schema.yaml delete mode 100644 data/schemas/mhwdcfg.schema.yaml delete mode 100644 data/schemas/mount.schema.yaml delete mode 100644 data/schemas/netgroups.schema.yaml delete mode 100644 data/schemas/netinstall.schema.yaml delete mode 100644 data/schemas/packages.schema.yaml delete mode 100644 data/schemas/partition.schema.yaml delete mode 100644 data/schemas/plymouthcfg.schema.yaml delete mode 100644 data/schemas/postcfg.schema.yaml delete mode 100644 data/schemas/removeuser.schema.yaml delete mode 100644 data/schemas/services.schema.yaml delete mode 100644 data/schemas/servicescfg.schema.yaml delete mode 100644 data/schemas/settings.schema.yaml delete mode 100644 data/schemas/umount.schema.yaml delete mode 100644 data/schemas/unpackfs.schema.yaml delete mode 100644 data/schemas/users.schema.yaml delete mode 100644 data/schemas/welcome.schema.yaml diff --git a/Makefile b/Makefile index 771ed28..b7ad4ed 100644 --- a/Makefile +++ b/Makefile @@ -111,36 +111,6 @@ LIBS_YAML = \ SHARED_YAML = \ data/linux.preset -SCHEMAS = \ - data/schemas/bootloader.schema.yaml \ - data/schemas/chrootcfg.schema.yaml \ - data/schemas/displaymanager.schema.yaml \ - data/schemas/finished.schema.yaml \ - data/schemas/fstab.schema.yaml \ - data/schemas/grubcfg.schema.yaml \ - data/schemas/initcpio.schema.yaml \ - data/schemas/keyboard.schema.yaml \ - data/schemas/license.schema.yaml \ - data/schemas/locale.schema.yaml \ - data/schemas/luksopenswaphookcfg.schema.yaml \ - data/schemas/machineid.schema.yaml \ - data/schemas/mhwdcfg.schema.yaml \ - data/schemas/mount.schema.yaml \ - data/schemas/netgroups.schema.yaml \ - data/schemas/netinstall.schema.yaml \ - data/schemas/packages.schema.yaml \ - data/schemas/partition.schema.yaml \ - data/schemas/plymouthcfg.schema.yaml \ - data/schemas/postcfg.schema.yaml \ - data/schemas/removeuser.schema.yaml \ - data/schemas/services.schema.yaml \ - data/schemas/servicescfg.schema.yaml \ - data/schemas/settings.schema.yaml \ - data/schemas/umount.schema.yaml \ - data/schemas/unpackfs.schema.yaml \ - data/schemas/users.schema.yaml \ - data/schemas/welcome.schema.yaml - all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO) $(BIN_YAML) doc edit = sed -e "s|@datadir[@]|$(DESTDIR)$(PREFIX)/share/manjaro-tools|g" \ @@ -235,9 +205,6 @@ install_yaml: install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools install -m0644 ${SHARED_YAML} $(DESTDIR)$(PREFIX)/share/manjaro-tools - install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools/schemas - install -m0644 ${SCHEMAS} $(DESTDIR)$(PREFIX)/share/manjaro-tools/schemas - install -dm0755 $(DESTDIR)$(PREFIX)/share/man/man1 gzip -c man/check-yaml.1 > $(DESTDIR)$(PREFIX)/share/man/man1/check-yaml.1.gz @@ -273,7 +240,6 @@ uninstall_iso: uninstall_yaml: for f in ${BIN_YAML}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done for f in ${LIBS_YAML}; do rm -f $(DESTDIR)$(PREFIX)/lib/manjaro-tools/$$f; done - for f in ${SCHEMAS}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/schemas/$$f; done for f in ${SHARED_YAML}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/$$f; done rm -f $(DESTDIR)$(PREFIX)/share/man/man1/check-yaml.1.gz diff --git a/data/schemas/bootloader.schema.yaml b/data/schemas/bootloader.schema.yaml deleted file mode 100644 index 7db9cab..0000000 --- a/data/schemas/bootloader.schema.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -type: map -mapping: - efiBootLoader: { type: str, required: true } - kernel: { type: str, required: true } - img: { type: str, required: true } - fallback: { type: str, required: true } - timeout: { type: str, required: true } - bootloaderEntryName: { type: str } - kernelLine: { type: str, required: true } - fallbackKernelLine: { type: str, required: true } - grubInstall: { type: str, required: true } - grubMkconfig: { type: str, required: true } - grubCfg: { type: str, required: true } - efiBootloaderId: { type: str } diff --git a/data/schemas/chrootcfg.schema.yaml b/data/schemas/chrootcfg.schema.yaml deleted file mode 100644 index 0d2d9e2..0000000 --- a/data/schemas/chrootcfg.schema.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -type: map -mapping: - requirements: - type: seq - sequence: - - type: map - mapping: - "name": { type: str, required: true } - "mode": { type: str, required: true } - keyrings: - type: seq - sequence: - - type: str diff --git a/data/schemas/displaymanager.schema.yaml b/data/schemas/displaymanager.schema.yaml deleted file mode 100644 index aeec892..0000000 --- a/data/schemas/displaymanager.schema.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -type: map -mapping: - "displaymanagers": - type: seq - sequence: - - { type: str, required: true, enum: [slim, sddm, lightdm, gdm, mdm, lxdm, kdm] } - "defaultDesktopEnvironment": - type: map - mapping: - "executable": { type: str } - "desktopFile": { type: str } - "basicSetup": { type: bool, default: false } diff --git a/data/schemas/finished.schema.yaml b/data/schemas/finished.schema.yaml deleted file mode 100644 index 678423f..0000000 --- a/data/schemas/finished.schema.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -type: map -mapping: - "restartNowEnabled": { type: bool, default: true } - "restartNowChecked": { type: bool, default: false } - "restartNowCommand": { type: str, required: true } diff --git a/data/schemas/fstab.schema.yaml b/data/schemas/fstab.schema.yaml deleted file mode 100644 index 8208361..0000000 --- a/data/schemas/fstab.schema.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -type: map -mapping: - "mountOptions": - type: map - mapping: - "default": { type: str, required: true } - "btrfs": { type: str, required: true } - "ssdExtraMountOptions": - type: map - mapping: - "ext4": { type: str, required: true } - "jfs": { type: str, required: true } - "xfs": { type: str, required: true } - "swap": { type: str, required: true } - "btrfs": { type: str, required: true } diff --git a/data/schemas/grubcfg.schema.yaml b/data/schemas/grubcfg.schema.yaml deleted file mode 100644 index 2ed4b1c..0000000 --- a/data/schemas/grubcfg.schema.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -type: map -mapping: - "overwrite": { type: bool, default: false } - "defaults": - type: map - mapping: - "GRUB_TIMEOUT": { type: int, required: true } - "GRUB_DEFAULT": { type: str, required: true } - "GRUB_DISABLE_SUBMENU": { type: bool, default: true } - "GRUB_TERMINAL_OUTPUT": { type: str, required: true } - "GRUB_DISABLE_RECOVERY": { type: bool, default: true } diff --git a/data/schemas/initcpio.schema.yaml b/data/schemas/initcpio.schema.yaml deleted file mode 100644 index 9a86e50..0000000 --- a/data/schemas/initcpio.schema.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -type: map -mapping: - kernel: { type: str, required: true } diff --git a/data/schemas/keyboard.schema.yaml b/data/schemas/keyboard.schema.yaml deleted file mode 100644 index 849e629..0000000 --- a/data/schemas/keyboard.schema.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -type: map -mapping: - xOrgConfFileName: { type: str, required: true } - convertedKeymapPath: { type: str, required: true } diff --git a/data/schemas/license.schema.yaml b/data/schemas/license.schema.yaml deleted file mode 100644 index 6a898ee..0000000 --- a/data/schemas/license.schema.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -type: map -mapping: - "entries": - type: seq - sequence: - - type: map - mapping: - "id": { type: str } - "name": { type: str } - "vendor": { type: str } - "type": { type: str } - "url": { type: str } - "required": { type: bool, default: false } diff --git a/data/schemas/locale.schema.yaml b/data/schemas/locale.schema.yaml deleted file mode 100644 index bf8c272..0000000 --- a/data/schemas/locale.schema.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -type: map -mapping: - "region": { type: str } - "zone": { type: str } - "localeGenPath": { type: str, required: true } - "geoipUrl": { type: str } diff --git a/data/schemas/luksopenswaphookcfg.schema.yaml b/data/schemas/luksopenswaphookcfg.schema.yaml deleted file mode 100644 index 29033ae..0000000 --- a/data/schemas/luksopenswaphookcfg.schema.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -type: map -mapping: - "configFilePath": { type: str, required: true } diff --git a/data/schemas/machineid.schema.yaml b/data/schemas/machineid.schema.yaml deleted file mode 100644 index 660dbf6..0000000 --- a/data/schemas/machineid.schema.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -type: map -mapping: - "systemd": { type: bool, default: true } - "dbus": { type: bool, default: true } - "symlink": { type: bool, default: true } diff --git a/data/schemas/mhwdcfg.schema.yaml b/data/schemas/mhwdcfg.schema.yaml deleted file mode 100644 index 4ca447c..0000000 --- a/data/schemas/mhwdcfg.schema.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -type: map -mapping: - "bus": - type: seq - sequence: - - type: str - "identifier": - type: map - mapping: - "net": - type: seq - sequence: - - type: int - "video": - type: seq - sequence: - - type: int - "driver": { type: str, required: true } - "local": { type: bool, default: true } - "repo": { type: str, required: true } diff --git a/data/schemas/mount.schema.yaml b/data/schemas/mount.schema.yaml deleted file mode 100644 index bbb8e3b..0000000 --- a/data/schemas/mount.schema.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -type: map -mapping: - "extraMounts": - type: seq - sequence: - - type: map - mapping: - "device": { type: str, required: true } - "fs": { type: str } - "mountPoint": { type: str, required: true } - "options": { type: str } - "extraMountsEfi": - type: seq - sequence: - - type: map - mapping: - "device": { type: str, required: true } - "fs": { type: str } - "mountPoint": { type: str, required: true } - "options": { type: str } diff --git a/data/schemas/netgroups.schema.yaml b/data/schemas/netgroups.schema.yaml deleted file mode 100644 index b8fdc21..0000000 --- a/data/schemas/netgroups.schema.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -type: seq -sequence: - - type: map - mapping: - "name": { type: str, required: true } - "description": { type: str, required: true } - "selected": { type: bool, default: false } - "hidden": { type: bool, default: false } - "packages": - type: seq - required: true - sequence: - - { type: text } diff --git a/data/schemas/netinstall.schema.yaml b/data/schemas/netinstall.schema.yaml deleted file mode 100644 index 2a36b37..0000000 --- a/data/schemas/netinstall.schema.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -type: map -mapping: - groupsUrl: { type: str, required: true } diff --git a/data/schemas/packages.schema.yaml b/data/schemas/packages.schema.yaml deleted file mode 100644 index dfe4801..0000000 --- a/data/schemas/packages.schema.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -type: map -mapping: - "backend": { type: str, required: true, enum: [packagekit, zypp, yum, dnf, urpmi, apt, pacman, portage, entropy] } - "operations": - type: seq - sequence: - - type: map - mapping: - "install": - type: seq - sequence: - - { type: text } - "remove": - type: seq - sequence: - - { type: text } - "localInstall": - type: seq - sequence: - - { type: text } diff --git a/data/schemas/partition.schema.yaml b/data/schemas/partition.schema.yaml deleted file mode 100644 index 8456ee2..0000000 --- a/data/schemas/partition.schema.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -type: map -mapping: - efiSystemPartition: { type: str, required: true } - ensureSuspendToDisk: { type: bool, default: true } - drawNestedPartitions: { type: bool, default: false } - alwaysShowPartitionLabels: { type: bool, default: true } - defaultFileSystemType: { type: str, required: true } diff --git a/data/schemas/plymouthcfg.schema.yaml b/data/schemas/plymouthcfg.schema.yaml deleted file mode 100644 index 07b0ee3..0000000 --- a/data/schemas/plymouthcfg.schema.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -type: map -mapping: - plymouth_theme: { type: str } diff --git a/data/schemas/postcfg.schema.yaml b/data/schemas/postcfg.schema.yaml deleted file mode 100644 index a0d518a..0000000 --- a/data/schemas/postcfg.schema.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -type: map -mapping: - "keyrings": - type: seq - sequence: - - { type: str } - "samba": - type: seq - sequence: - - type: map - mapping: - "workgroup": { type: str } diff --git a/data/schemas/removeuser.schema.yaml b/data/schemas/removeuser.schema.yaml deleted file mode 100644 index 766b27b..0000000 --- a/data/schemas/removeuser.schema.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -type: map -mapping: - "username": { type: str, required: true } diff --git a/data/schemas/services.schema.yaml b/data/schemas/services.schema.yaml deleted file mode 100644 index 648ae37..0000000 --- a/data/schemas/services.schema.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -type: map -mapping: - "services": - type: seq - sequence: - - type: map - mapping: - "name": { type: str } - "mandatory": { type: bool, default: false } - "targets": - type: seq - sequence: - - type: map - mapping: - "name": { type: str } - "mandatory": { type: bool, default: true } - "disable": - type: seq - sequence: - - type: map - mapping: - "name": { type: str } - "mandatory": { type: bool, default: false } diff --git a/data/schemas/servicescfg.schema.yaml b/data/schemas/servicescfg.schema.yaml deleted file mode 100644 index cb93af0..0000000 --- a/data/schemas/servicescfg.schema.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -type: map -mapping: - "services": - type: map - mapping: - "enabled": - type: seq - sequence: - - type: map - mapping: - "name": { type: str } - "runlevel": { type: str, enum: [default, sysinit, boot, shutdown, nonetwork] } - "disabled": - type: seq - sequence: - - type: map - mapping: - "name": { type: str } - "runlevel": { type: str, enum: [default, sysinit, boot, shutdown, nonetwork] } diff --git a/data/schemas/settings.schema.yaml b/data/schemas/settings.schema.yaml deleted file mode 100644 index fdb10f5..0000000 --- a/data/schemas/settings.schema.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -type: map -mapping: - "modules-search": - required: true - type: seq - sequence: - - { type: str } - "instances": - type: seq - sequence: - - type: map - mapping: - "id": { type: str } - "module": { type: str } - "config": { type: str } - "sequence": - type: seq - sequence: - - type: map - mapping: - "show": - type: seq - sequence: - - { type: str, enum: [welcome, netinstall, locale, keyboard, partition, users, summary, finished], unique: true } - "exec": - type: seq - sequence: - - { type: str, enum: [partition, mount, chrootcfg, unpackfs, networkcfg, machineid, fstab, locale, keyboard, localecfg, luksopenswaphookcfg, luksbootkeyfile, plymouthcfg, initcpiocfg, initcpio, users, displaymanager, mhwdcfg, hwclock, servicescfg, services, grubcfg, bootloader, postcfg, umount, packages, removeuser, dracut], unique: true } - "branding": { type: str, required: true } - "prompt-install": { type: bool, default: false } - "dont-chroot": { type: bool, default: false } diff --git a/data/schemas/umount.schema.yaml b/data/schemas/umount.schema.yaml deleted file mode 100644 index b0f3bdb..0000000 --- a/data/schemas/umount.schema.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -type: map -mapping: - "srcLog": { type: str } - "destLog": { type: str } diff --git a/data/schemas/unpackfs.schema.yaml b/data/schemas/unpackfs.schema.yaml deleted file mode 100644 index 6ec2534..0000000 --- a/data/schemas/unpackfs.schema.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -type: map -mapping: - "unpack": - type: seq - sequence: - - type: map - mapping: - "source": { type: str } - "sourcefs": { type: str } - "destination": { type: str } diff --git a/data/schemas/users.schema.yaml b/data/schemas/users.schema.yaml deleted file mode 100644 index 387c4fb..0000000 --- a/data/schemas/users.schema.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -type: map -mapping: - "defaultGroups": - required: true - type: seq - sequence: - - { type: str } - "autologinGroup": { type: str, required: true } - "doAutologin": { type: bool, default: true } - "sudoersGroup": { type: str, required: true } - "setRootPassword": { type: bool, default: true } - "doReusePassword": { type: bool, default: true } diff --git a/data/schemas/welcome.schema.yaml b/data/schemas/welcome.schema.yaml deleted file mode 100644 index 905b38c..0000000 --- a/data/schemas/welcome.schema.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -type: map -mapping: - "showSupportUrl": { type: bool, default: true } - "showKnownIssuesUrl": { type: bool, default: true } - "showReleaseNotesUrl": { type: bool, default: true } - "requirements": - type: map - mapping: - "requiredStorage": { type: float, required: true } - "requiredRam": { type: float, required: true } - "check": - required: true - type: seq - sequence: - - { type: str, enum: [storage, ram, power, internet, root], unique: true } - "required": - required: true - type: seq - sequence: - - { type: str, enum: [storage, ram, power, internet, root], unique: true } diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh index dc69dfd..a93e934 100644 --- a/lib/util-yaml.sh +++ b/lib/util-yaml.sh @@ -360,7 +360,8 @@ check_yaml(){ # cp $1 $data ;; esac - schema=${DATADIR}/schemas/$name.schema.yaml + local schemas_dir=/usr/share/calamares/schemas + schema=${schemas_dir}/$name.schema.yaml # pykwalify -d $data -s $schema kwalify -lf $schema $data }