diff options
author | Gordon GECOS <u@adam> | 2020-10-25 18:31:52 -0400 |
---|---|---|
committer | Gordon GECOS <u@adam> | 2020-10-25 18:31:52 -0400 |
commit | c4920ad13882294bf5818f6a09e0ffd8d127a179 (patch) | |
tree | cc4db0fdf5f0202420061a1d4f04f30dd0428b99 /src | |
parent | 4840616b1fdf95e86ce21109063370f046289d9f (diff) |
parted-usb.sh: try multiple defaults for $GPG_INPUT_DIR
Diffstat (limited to 'src')
-rwxr-xr-x | src/parted-usb.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/parted-usb.sh b/src/parted-usb.sh index 919aae2..4302f1b 100755 --- a/src/parted-usb.sh +++ b/src/parted-usb.sh | |||
@@ -219,9 +219,17 @@ samizdat_linux_dir=/boot | |||
219 | 219 | ||
220 | ROOTFS=rootfs/samizdat-gold.seed.btrfs | 220 | ROOTFS=rootfs/samizdat-gold.seed.btrfs |
221 | #PATCHFS=rootfs/samizdat.patch.btrfs | 221 | #PATCHFS=rootfs/samizdat.patch.btrfs |
222 | GPG_INPUT_DIR=/root/.gnupg | ||
223 | 222 | ||
224 | : ${GPG_INPUT_DIR:=/cdrom/gnupghome} | 223 | if [ ! "$GPG_INPUT_DIR" ] |
224 | then | ||
225 | for d in $GPG_INPUT_DIR /root/.gnupg /cdrom/gnupghome | ||
226 | do | ||
227 | [ -d "$d" ] || continue | ||
228 | GPG_INPUT_DIR=$d | ||
229 | break | ||
230 | done | ||
231 | fi | ||
232 | |||
225 | : ${GRUB_CONFIG:=conf/grub.cfg} | 233 | : ${GRUB_CONFIG:=conf/grub.cfg} |
226 | start_keys=64 # megs | 234 | start_keys=64 # megs |
227 | end_keys=256 # megs | 235 | end_keys=256 # megs |