root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

remove schemas; now packaged in calamares-tools

Browse source
This commit is contained in:
udeved 2016-09-29 22:18:33 +02:00
parent 8bdd63d522
commit 9ebc5e6afb
30 changed files with 2 additions and 387 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Makefile
View file

@ -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

15
data/schemas/bootloader.schema.yaml
View file

@ -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 }

14
data/schemas/chrootcfg.schema.yaml
View file

@ -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

13
data/schemas/displaymanager.schema.yaml
View file

@ -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 }

6
data/schemas/finished.schema.yaml
View file

@ -1,6 +0,0 @@
---
type: map
mapping:
"restartNowEnabled": { type: bool, default: true }
"restartNowChecked": { type: bool, default: false }
"restartNowCommand": { type: str, required: true }

16
data/schemas/fstab.schema.yaml
View file

@ -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 }

12
data/schemas/grubcfg.schema.yaml
View file

@ -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 }

4
data/schemas/initcpio.schema.yaml
View file

@ -1,4 +0,0 @@
---
type: map
mapping:
kernel: { type: str, required: true }

5
data/schemas/keyboard.schema.yaml
View file

@ -1,5 +0,0 @@
---
type: map
mapping:
xOrgConfFileName: { type: str, required: true }
convertedKeymapPath: { type: str, required: true }

14
data/schemas/license.schema.yaml
View file

@ -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 }

7
data/schemas/locale.schema.yaml
View file

@ -1,7 +0,0 @@
---
type: map
mapping:
"region": { type: str }
"zone": { type: str }
"localeGenPath": { type: str, required: true }
"geoipUrl": { type: str }

4
data/schemas/luksopenswaphookcfg.schema.yaml
View file

@ -1,4 +0,0 @@
---
type: map
mapping:
"configFilePath": { type: str, required: true }

6
data/schemas/machineid.schema.yaml
View file

@ -1,6 +0,0 @@
---
type: map
mapping:
"systemd": { type: bool, default: true }
"dbus": { type: bool, default: true }
"symlink": { type: bool, default: true }

21
data/schemas/mhwdcfg.schema.yaml
View file

@ -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 }

21
data/schemas/mount.schema.yaml
View file

@ -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 }

14
data/schemas/netgroups.schema.yaml
View file

@ -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 }

4
data/schemas/netinstall.schema.yaml
View file

@ -1,4 +0,0 @@
---
type: map
mapping:
groupsUrl: { type: str, required: true }

21
data/schemas/packages.schema.yaml
View file

@ -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 }

8
data/schemas/partition.schema.yaml
View file

@ -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 }

4
data/schemas/plymouthcfg.schema.yaml
View file

@ -1,4 +0,0 @@
---
type: map
mapping:
plymouth_theme: { type: str }

13
data/schemas/postcfg.schema.yaml
View file

@ -1,13 +0,0 @@
---
type: map
mapping:
"keyrings":
type: seq
sequence:
- { type: str }
"samba":
type: seq
sequence:
- type: map
mapping:
"workgroup": { type: str }

4
data/schemas/removeuser.schema.yaml
View file

@ -1,4 +0,0 @@
---
type: map
mapping:
"username": { type: str, required: true }

24
data/schemas/services.schema.yaml
View file

@ -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 }

20
data/schemas/servicescfg.schema.yaml
View file

@ -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] }

32
data/schemas/settings.schema.yaml
View file

@ -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 }

5
data/schemas/umount.schema.yaml
View file

@ -1,5 +0,0 @@
---
type: map
mapping:
"srcLog": { type: str }
"destLog": { type: str }

11
data/schemas/unpackfs.schema.yaml
View file

@ -1,11 +0,0 @@
---
type: map
mapping:
"unpack":
type: seq
sequence:
- type: map
mapping:
"source": { type: str }
"sourcefs": { type: str }
"destination": { type: str }

13
data/schemas/users.schema.yaml
View file

@ -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 }

21
data/schemas/welcome.schema.yaml
View file

@ -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 }

3
lib/util-yaml.sh
View file

@ -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
}