summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------fsmgr0
-rwxr-xr-xsrc/parted-usb.sh12
2 files changed, 10 insertions, 2 deletions
diff --git a/fsmgr b/fsmgr
Subproject 0715d83acfea3dd97c9eb1c2bd4be5977786549 Subproject a889ea181ff4a30440ada6c87ac63725942b8f3
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
220ROOTFS=rootfs/samizdat-gold.seed.btrfs 220ROOTFS=rootfs/samizdat-gold.seed.btrfs
221#PATCHFS=rootfs/samizdat.patch.btrfs 221#PATCHFS=rootfs/samizdat.patch.btrfs
222GPG_INPUT_DIR=/root/.gnupg
223 222
224: ${GPG_INPUT_DIR:=/cdrom/gnupghome} 223if [ ! "$GPG_INPUT_DIR" ]
224then
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
231fi
232
225: ${GRUB_CONFIG:=conf/grub.cfg} 233: ${GRUB_CONFIG:=conf/grub.cfg}
226start_keys=64 # megs 234start_keys=64 # megs
227end_keys=256 # megs 235end_keys=256 # megs