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.

1 files changed, 21 insertions, 1 deletions

diff --git a/src/initrd/grok-block b/src/initrd/grok-block
index 01265b0..1152584 100755
--- a/src/initrd/grok-block
+++ b/src/initrd/grok-block
@@ -36,6 +36,14 @@ addmenu_chooseroot()
     "menu-select --fs=$ID_FS_TYPE boot-luks $device ${loopfile:-$device}"
 }
 
+addmenu_choose_native_root()
+{
+    local device="$1" loopfile="$2"
+    addmenu "$device//$device" \
+            "[ Boot the system on $device ]" \
+            "menu-select --fs=$ID_FS_TYPE boot-native $device"
+}
+
 addmenu_makeroot()
 {
   local device="$1" loopfile="$2" megs="$3" copy_cdrom="$4"
@@ -50,7 +58,7 @@ addmenu_destroy_hard_drive()
 {
     local device="$1"
     (
-        addmenu "$device//$loopfile" \
+        addmenu "$device//$device" \
                 "[ Install Samizdat to $device -- THIS DESTROYS ALL DATA ]" \
                 "menu-select boot-destroy-disk $device"
     ) &
@@ -108,6 +116,13 @@ is_incomplete_samizdat_install()
     [ "$partition_names" = 'samizdat-grub-incomplete:samizdat-plaintext-incomplete:samizdat-luks-encrypted-incomplete:' ]
 }
 
+parent_device()
+{
+    local d="$1"
+    while [ "$d" != "${d%[0-9]}" ]; do d=${d%[0-9]}; done
+    printf '%s' "$d"
+}
+
 grok_block()
 {
   local mountpoint="/mnt/${DEVNAME##*/}"
@@ -124,6 +139,11 @@ grok_block()
   # TODO: make these names more unique
   case "$ID_PART_ENTRY_NAME" in
       samizdat-grub-incomplete|samizdat-plaintext-incomplete|samizdat-luks-encrypted-incomplete) return ;;
+      samizdat-grub|samizdat-plaintext|samizdat-luks-encrypted)
+          # TODO: Possibly only some of these are complete
+          addmenu_choose_native_root "$(parent_device "$DEVNAME")"
+          return
+      ;;
   esac
 
   if [ "$ID_FS_TYPE" = hfsplus ] && ! fsck.hfsplus -q "$DEVNAME"; then