summaryrefslogtreecommitdiff
path: root/src/initrd/menu-select
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2017-03-26 22:20:18 -0400
committerAndrew Cady <d@jerkface.net>2017-03-26 22:20:18 -0400
commit3af02e032f39ba16c3f8de2e606abec317d99354 (patch)
tree6c4717162fe8e16e31ce92baaaa3ce09a725de09 /src/initrd/menu-select
parentc470b6ca6075b33c2c696ca34070671ee32a8d76 (diff)
fully enable booting from installed native partition
Diffstat (limited to 'src/initrd/menu-select')
-rwxr-xr-xsrc/initrd/menu-select7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/initrd/menu-select b/src/initrd/menu-select
index 625f775..4c921b0 100755
--- a/src/initrd/menu-select
+++ b/src/initrd/menu-select
@@ -80,6 +80,7 @@ case "$1" in
80 umount /root 80 umount /root
81 error 81 error
82 } 82 }
83 bootdone root-mounted
83 ;; 84 ;;
84 boot-destroy-disk) 85 boot-destroy-disk)
85 dev="$2" 86 dev="$2"
@@ -93,6 +94,9 @@ case "$1" in
93 init_samizdat_blockdev "$dev"3 /gpg/disk.key || error 94 init_samizdat_blockdev "$dev"3 /gpg/disk.key || error
94 init_samizdat /dev/mapper/samizdatcrypt '' || error 95 init_samizdat /dev/mapper/samizdatcrypt '' || error
95 96
97 mark_partitions_as_complete "$dev"
98
99 bootdone root-mounted
96 ;; 100 ;;
97 boot-native) 101 boot-native)
98 dev="$2" 102 dev="$2"
@@ -100,6 +104,7 @@ case "$1" in
100 mount "$dev"2 /gpg || error 104 mount "$dev"2 /gpg || error
101 open_samizdat_blockdev "$dev"3 /gpg/disk.key || error 105 open_samizdat_blockdev "$dev"3 /gpg/disk.key || error
102 open_samizdat || error 106 open_samizdat || error
107 bootdone root-mounted
103 ;; 108 ;;
104 boot-overwrite|boot-new|boot-luks) 109 boot-overwrite|boot-new|boot-luks)
105 dev="$2" 110 dev="$2"
@@ -121,6 +126,7 @@ case "$1" in
121 if [ "$1" = 'boot-luks' ]; then 126 if [ "$1" = 'boot-luks' ]; then
122 open_samizdat_blockdev_from_loop "$loopfile" "$loopfile"k || error 127 open_samizdat_blockdev_from_loop "$loopfile" "$loopfile"k || error
123 open_samizdat || error 128 open_samizdat || error
129 bootdone root-mounted
124 exit 130 exit
125 fi 131 fi
126 132
@@ -130,6 +136,7 @@ case "$1" in
130 init_samizdat_blockdev "$newdev" "$loopfile"k && 136 init_samizdat_blockdev "$newdev" "$loopfile"k &&
131 init_samizdat /dev/mapper/samizdatcrypt "$loopfile"; then 137 init_samizdat /dev/mapper/samizdatcrypt "$loopfile"; then
132 stop_meter done. 138 stop_meter done.
139 bootdone root-mounted
133 else 140 else
134 stop_meter error! 141 stop_meter error!
135 rm "$loopfile" "$loopfile"k 142 rm "$loopfile" "$loopfile"k