diff options
author | Mauro Santos | 2017-12-13 17:06:57 +0000 |
---|---|---|
committer | Mauro Santos | 2017-12-13 17:15:11 +0000 |
commit | 8b9576524373f6fab65be1d28275b2f8635288b6 (patch) | |
tree | 2616c870869a9ec5477748e1472251f03509daac | |
parent | 988061c751e141a1672b0f79645cfba50d0a328d (diff) | |
download | aur-8b9576524373f6fab65be1d28275b2f8635288b6.tar.gz |
Split linuxpba.conf into linuxpba.conf and mkinitcpio.conf.
Busybox's ash does not support arrays and chokes when loading linuxpba.conf
after the change to arrayize some configuration variables. Splitting
linuxpba.conf avoids that problem and at the same time makes the configuration
more logical, linuxpba's configuration goes into linuxpba.conf and mkinitpio's
configuration goes into mkinitpio.conf.
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 15 | ||||
-rw-r--r-- | linuxpba.conf.etc | 14 | ||||
-rw-r--r-- | mkinitcpio.conf.etc | 8 | ||||
-rw-r--r-- | mkinitcpio.conf.lib (renamed from linuxpba.conf.lib) | 1 | ||||
-rwxr-xr-x | mklinuxpba-initramfs | 4 |
6 files changed, 28 insertions, 28 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Oct 29 17:32:53 UTC 2017 +# Wed Dec 13 17:11:14 UTC 2017 pkgbase = sedutil pkgdesc = TCG OPAL 2.00 SED Management Program pkgver = 1.15.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/Drive-Trust-Alliance/sedutil install = sedutil.install arch = i686 @@ -21,17 +21,19 @@ pkgbase = sedutil source = mklinuxpba-diskimg source = linuxpba-arch source = linuxpba.conf.etc - source = linuxpba.conf.lib + source = mkinitcpio.conf.etc + source = mkinitcpio.conf.lib source = linuxpba.hook source = linuxpba.install source = getpasswd.c sha256sums = 9259466b4f73af276153c5245834a56f48f8721ea7263611b5d5e8326bc43d9e sha256sums = 40d785c16a28a5a8a43050d1731174482ee24459be215d2e4e27ffba3b2e28b2 - sha256sums = 77c725e4eee095dbede512d2bca13b8f2c139a67b9b87a11d98be94e6df0e1d7 + sha256sums = ee3171da9eeab5170815713280588db99118a5fba73eea6373f8555451ab1e5c sha256sums = b860d4d6fcc14a61d110c1d805d919fdfcf0fffaa8f0175b5ecddf60051f7941 sha256sums = afc39b504456263e55d137847ff20ec5bb0a399ef8e17bb4ca13f0a2bd80052a - sha256sums = 5920733d52a2ba7e4df06ea4df51a0a35d365bd3e4af5019374a7265022e797f - sha256sums = 753677785dd89ff036b70774d1d4ad4f3bce8e28de54932e86460e2a81b897de + sha256sums = e5c3acb3027c7a3c5082d5cf0f5193f190788e64045d2c79a9fd1598b56f151f + sha256sums = 44ba634f4b35b1267d62b8b1505fa08a3d5bafa33ebb651ad7b09b53941c40eb + sha256sums = daaa13d48b9e72e3185594a0f7c54d2966711ef03b5444141d41be9994710c82 sha256sums = d9a7b66d8365e7f4eb0233b30c0ab70b5e978f6554960bf12994a1f0910c1447 sha256sums = f31a0ba891dd705ef68174afeb651bdc3426a63202d058d98510907de43248f7 sha256sums = e94d011c98bd336f37d6d4923e5d63a22ebd10d8f2c6486b6bcd6617524d6484 @@ -2,7 +2,7 @@ pkgname=sedutil pkgver=1.15.1 -pkgrel=1 +pkgrel=2 pkgdesc="TCG OPAL 2.00 SED Management Program" arch=('i686' 'x86_64') url="https://github.com/Drive-Trust-Alliance/sedutil" @@ -20,17 +20,19 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Drive-Trust-Alliance/${ 'mklinuxpba-diskimg' 'linuxpba-arch' 'linuxpba.conf.etc' - 'linuxpba.conf.lib' + 'mkinitcpio.conf.etc' + 'mkinitcpio.conf.lib' 'linuxpba.hook' 'linuxpba.install' 'getpasswd.c') sha256sums=('9259466b4f73af276153c5245834a56f48f8721ea7263611b5d5e8326bc43d9e' '40d785c16a28a5a8a43050d1731174482ee24459be215d2e4e27ffba3b2e28b2' - '77c725e4eee095dbede512d2bca13b8f2c139a67b9b87a11d98be94e6df0e1d7' + 'ee3171da9eeab5170815713280588db99118a5fba73eea6373f8555451ab1e5c' 'b860d4d6fcc14a61d110c1d805d919fdfcf0fffaa8f0175b5ecddf60051f7941' 'afc39b504456263e55d137847ff20ec5bb0a399ef8e17bb4ca13f0a2bd80052a' - '5920733d52a2ba7e4df06ea4df51a0a35d365bd3e4af5019374a7265022e797f' - '753677785dd89ff036b70774d1d4ad4f3bce8e28de54932e86460e2a81b897de' + 'e5c3acb3027c7a3c5082d5cf0f5193f190788e64045d2c79a9fd1598b56f151f' + '44ba634f4b35b1267d62b8b1505fa08a3d5bafa33ebb651ad7b09b53941c40eb' + 'daaa13d48b9e72e3185594a0f7c54d2966711ef03b5444141d41be9994710c82' 'd9a7b66d8365e7f4eb0233b30c0ab70b5e978f6554960bf12994a1f0910c1447' 'f31a0ba891dd705ef68174afeb651bdc3426a63202d058d98510907de43248f7' 'e94d011c98bd336f37d6d4923e5d63a22ebd10d8f2c6486b6bcd6617524d6484') @@ -64,6 +66,7 @@ package() { install -Dm644 "${srcdir}/linuxpba.hook" "${pkgdir}/usr/lib/initcpio/hooks/linuxpba" install -Dm644 "${srcdir}/linuxpba.install" "${pkgdir}/usr/lib/initcpio/install/linuxpba" install -Dm644 "${srcdir}/linuxpba.conf.etc" "${pkgdir}/etc/linuxpba/linuxpba.conf" - install -Dm644 "${srcdir}/linuxpba.conf.lib" "${pkgdir}/usr/lib/linuxpba/linuxpba.conf" + install -Dm644 "${srcdir}/mkinitcpio.conf.etc" "${pkgdir}/etc/linuxpba/mkinitcpio.conf" + install -Dm644 "${srcdir}/mkinitcpio.conf.lib" "${pkgdir}/usr/lib/linuxpba/mkinitcpio.conf" install -Dm644 "${srcdir}/syslinux.cfg" "${pkgdir}/usr/lib/linuxpba/syslinux.cfg" } diff --git a/linuxpba.conf.etc b/linuxpba.conf.etc index 406caacbe069..35f03b6112f1 100644 --- a/linuxpba.conf.etc +++ b/linuxpba.conf.etc @@ -1,17 +1,3 @@ -### mkinitcpio options ### - -MODULES=() -BINARIES=() -FILES=() -HOOKS=(base udev autodetect block keymap keyboard linuxpba) - -#COMPRESSION=<gzip|bzip2|lzma|xz|lzop|lz4> -COMPRESSION="xz" -#COMPRESSION_OPTIONS=() - - -### linuxpba options ### - # Use the PBA agent from sedutil that supports only password input # or use custom the PBA agent that supports keyfile, yubikey and # password input. This will result in the smallest initramfs image. diff --git a/mkinitcpio.conf.etc b/mkinitcpio.conf.etc new file mode 100644 index 000000000000..1ba3cbe5be4a --- /dev/null +++ b/mkinitcpio.conf.etc @@ -0,0 +1,8 @@ +MODULES=() +BINARIES=() +FILES=(/etc/udev/rules.d/10-cryptkey-devices.rules) +HOOKS=(base udev autodetect block keymap keyboard linuxpba) + +#COMPRESSION=<gzip|bzip2|lzma|xz|lzop|lz4> +COMPRESSION="gzip" +#COMPRESSION_OPTIONS=() diff --git a/linuxpba.conf.lib b/mkinitcpio.conf.lib index 3a8164630f6e..64432adad6c4 100644 --- a/linuxpba.conf.lib +++ b/mkinitcpio.conf.lib @@ -1,4 +1,5 @@ . /etc/linuxpba/linuxpba.conf +. /etc/linuxpba/mkinitcpio.conf if [[ "$USE_SEDUTIL_PBA" -eq 0 ]] then diff --git a/mklinuxpba-initramfs b/mklinuxpba-initramfs index 23fa82c2b8ea..8035ccc69051 100755 --- a/mklinuxpba-initramfs +++ b/mklinuxpba-initramfs @@ -1,4 +1,4 @@ #!/bin/bash -mkinitcpio -c /usr/lib/linuxpba/linuxpba.conf -g /boot/linuxpba.img -mkinitcpio -S autodetect -c /usr/lib/linuxpba/linuxpba.conf -g /boot/linuxpba-fallback.img +mkinitcpio -c /usr/lib/linuxpba/mkinitcpio.conf -g /boot/linuxpba.img +mkinitcpio -S autodetect -c /usr/lib/linuxpba/mkinitcpio.conf -g /boot/linuxpba-fallback.img |