summaryrefslogtreecommitdiff
path: root/old-school
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2016-04-27 03:22:12 -0400
committerAndrew Cady <d@jerkface.net>2016-04-27 03:56:56 -0400
commit5c2065ea789df2a0c1b98b2412e5f14711c9a49b (patch)
tree844cc2b4263d483cf056c205a90965888e342405 /old-school
parentc2e350df992079b5d9f7fef6064c1af604282d95 (diff)
get rid of unused isolinux files; change iso cdrom paths
Diffstat (limited to 'old-school')
-rwxr-xr-xold-school/grok-block2
-rw-r--r--old-school/lvm-create.sh5
2 files changed, 4 insertions, 3 deletions
diff --git a/old-school/grok-block b/old-school/grok-block
index 006a090..75d5120 100755
--- a/old-school/grok-block
+++ b/old-school/grok-block
@@ -72,7 +72,7 @@ retry_mount()
72gpg_verify() 72gpg_verify()
73{ 73{
74 bootwait samizdat-cdrom 74 bootwait samizdat-cdrom
75 gpg2 --lock-never --no-permission-warning --no-auto-check-trustdb --no-options --homedir /cdrom/samizdat/gpg/gnupghome --verify "$1" 75 gpg2 --lock-never --no-permission-warning --no-auto-check-trustdb --no-options --homedir /cdrom/gnupghome --verify "$1"
76} 76}
77is_lvm() 77is_lvm()
78{ 78{
diff --git a/old-school/lvm-create.sh b/old-school/lvm-create.sh
index b6d38d2..5a7657d 100644
--- a/old-school/lvm-create.sh
+++ b/old-school/lvm-create.sh
@@ -28,7 +28,7 @@ ceil4()
28 28
29losetup_layers() 29losetup_layers()
30{ 30{
31 for fs in /cdrom/live/*.btrfs; do 31 for fs in /cdrom/rootfs/*.btrfs; do
32 fs_rw=/"${fs##*/}".rw 32 fs_rw=/"${fs##*/}".rw
33 dd if=/dev/zero of="$fs_rw" bs=1M count=10 33 dd if=/dev/zero of="$fs_rw" bs=1M count=10
34 losetup_snapshot "$fs" "$fs_rw" || return 34 losetup_snapshot "$fs" "$fs_rw" || return
@@ -228,7 +228,8 @@ init_gpg()
228{ 228{
229 bootwait samizdat-cdrom 229 bootwait samizdat-cdrom
230 export GNUPGHOME=/gpg/gnupghome 230 export GNUPGHOME=/gpg/gnupghome
231 (umask 077; rsync --exclude '/luks-key*' --ignore-existing -rpP /cdrom/samizdat/gpg/ /gpg/) 231 mkdir -p "$GNUPGHOME"
232 (umask 077; rsync --exclude '/luks-key*' --ignore-existing -rpP /cdrom/gnupghome/ "$GNUPGHOME")
232 233
233 if samizdat-password-agent >/var/log/samizdat-password-agent.log 2>&1; then 234 if samizdat-password-agent >/var/log/samizdat-password-agent.log 2>&1; then
234 clear 235 clear