summaryrefslogtreecommitdiff
path: root/src/initrd/menu-select
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2017-03-26 07:30:09 -0400
committerAndrew Cady <d@jerkface.net>2017-03-26 07:49:54 -0400
commitc470b6ca6075b33c2c696ca34070671ee32a8d76 (patch)
tree782c311be2835b60c06e3dcc9892a63ad5793a6a /src/initrd/menu-select
parent217713edcd3a27d21577f8c4765f5b0d89981c7b (diff)
Implement booting already-installed native install
This option is only available if the partitions have been renamed to indicate finalization of the install. The code that finalizes the install by renaming the partitions is available, but not yet run after the install.
Diffstat (limited to 'src/initrd/menu-select')
-rwxr-xr-xsrc/initrd/menu-select10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/initrd/menu-select b/src/initrd/menu-select
index 4a141a4..625f775 100755
--- a/src/initrd/menu-select
+++ b/src/initrd/menu-select
@@ -94,6 +94,13 @@ case "$1" in
94 init_samizdat /dev/mapper/samizdatcrypt '' || error 94 init_samizdat /dev/mapper/samizdatcrypt '' || error
95 95
96 ;; 96 ;;
97 boot-native)
98 dev="$2"
99 init_gpg || error
100 mount "$dev"2 /gpg || error
101 open_samizdat_blockdev "$dev"3 /gpg/disk.key || error
102 open_samizdat || error
103 ;;
97 boot-overwrite|boot-new|boot-luks) 104 boot-overwrite|boot-new|boot-luks)
98 dev="$2" 105 dev="$2"
99 loopfile="$3" 106 loopfile="$3"
@@ -112,7 +119,8 @@ case "$1" in
112 init_gpg || error 119 init_gpg || error
113 120
114 if [ "$1" = 'boot-luks' ]; then 121 if [ "$1" = 'boot-luks' ]; then
115 open_samizdat "$loopfile" "$loopfile"k || error 122 open_samizdat_blockdev_from_loop "$loopfile" "$loopfile"k || error
123 open_samizdat || error
116 exit 124 exit
117 fi 125 fi
118 126