summaryrefslogtreecommitdiff
path: root/old-school
diff options
context:
space:
mode:
Diffstat (limited to 'old-school')
-rw-r--r--old-school/lvm-create.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/old-school/lvm-create.sh b/old-school/lvm-create.sh
index 0e88995..0238682 100644
--- a/old-school/lvm-create.sh
+++ b/old-school/lvm-create.sh
@@ -70,8 +70,8 @@ samizdat_movemounts()
70 fi 70 fi
71 mkdir /root/cdrom 71 mkdir /root/cdrom
72 mount -o move /cdrom /root/cdrom 72 mount -o move /cdrom /root/cdrom
73# mkdir /run/initramfs/samizdat 73 mkdir -p /run/initramfs/samizdat/log
74# mv /var/log /run/initramfs/samizdat/log 74 cp /var/log/* /run/initramfs/samizdat/log
75 true 75 true
76} 76}
77 77
@@ -147,8 +147,9 @@ filesystem_incomplete()
147 147
148open_samizdat() 148open_samizdat()
149{ 149{
150 open_samizdat_blockdev "$@" || return 150 local imgfile="$1" keyfile="$2"
151 local blockdev=/dev/mapper/samizdatcrypt imgfile="$1" fs 151 open_samizdat_blockdev "$imgfile" "$keyfile" || return
152 local blockdev=/dev/mapper/samizdatcrypt fs
152 153
153 # For this part, we don't necessarily need the cdrom. 154 # For this part, we don't necessarily need the cdrom.
154 # Unfortunately the init_gpg code is still getting the GPG key there. 155 # Unfortunately the init_gpg code is still getting the GPG key there.