1 files changed, 13 insertions, 6 deletions

diff --git a/src/initrd/grok-block b/src/initrd/grok-block
index 086722d..01265b0 100755
--- a/src/initrd/grok-block
+++ b/src/initrd/grok-block
@@ -7,7 +7,7 @@ case "$DEVNAME" in /dev/loop*|/dev/ram*|/dev/dm-*|/dev/md*|/dev/fd*) exit ;; esa
 
 debug_log "grok-block.${DEVNAME##*/}"
 
-addmenu_choosekey() 
+addmenu_choosekey()
 {
   dev=$1
   dir=$2
@@ -62,8 +62,8 @@ retry_mount()
   until mntout="$(mount "$@" 2>&1)"
   do
     tries=$(( tries - 1 ))
-    case "$mntout" in 
-      *"Device or resource busy"*) 
+    case "$mntout" in
+      *"Device or resource busy"*)
         if [ $tries -le 0 ]; then
           warn "mount $@ failed: $mntout"
           return 1
@@ -103,8 +103,9 @@ is_device_without_partitions()
 
 is_incomplete_samizdat_install()
 {
+    # TODO: Possibly only some of the partitions are incomplete
     local partition_names="$(parted -sm "$1" print | sed 1,2d | awk -F: -e '{printf "%s:", $6}')"
-    [ "$partition_names" = 'primary:gpg-incomplete:luks-incomplete:' ]
+    [ "$partition_names" = 'samizdat-grub-incomplete:samizdat-plaintext-incomplete:samizdat-luks-encrypted-incomplete:' ]
 }
 
 grok_block()
@@ -119,6 +120,12 @@ grok_block()
     *)    mount_type="-t $ID_FS_TYPE" ;;
   esac
 
+  # Skip partitions that we created.
+  # TODO: make these names more unique
+  case "$ID_PART_ENTRY_NAME" in
+      samizdat-grub-incomplete|samizdat-plaintext-incomplete|samizdat-luks-encrypted-incomplete) return ;;
+  esac
+
   if [ "$ID_FS_TYPE" = hfsplus ] && ! fsck.hfsplus -q "$DEVNAME"; then
     (if fsck.hfsplus "$DEVNAME"; then
       grok-block "$DEVNAME"
@@ -200,7 +207,7 @@ grok_block()
 }
 
 # Get me all them nice udev variables
-eval "$(PATH=$PATH:/lib/udev vol_id "$DEVNAME" | 
+eval "$(PATH=$PATH:/lib/udev vol_id "$DEVNAME" |
   sed "s/'/'\\\\''/; s/=\(.*\)/='\1'/"
 )"
 
@@ -209,7 +216,7 @@ CDROM_ID_FS_LABEL_ENC=$(sed 's/ /\\x20/g' /lib/samizdat/vol_id.txt)
 if [ "$ID_FS_UUID_ENC"  = "$CDROM_ID_FS_UUID_ENC" -o \
      "$ID_FS_LABEL_ENC" = "$CDROM_ID_FS_LABEL_ENC" ]
 then
-  # Recognize and mount the Samizdat 
+  # Recognize and mount the Samizdat
   if ! mountpoint -q /cdrom; then
     mkdir -p /cdrom
     . mdadm-dup.sh