partvi: clarify code

1 files changed, 12 insertions, 17 deletions

diff --git a/src/partvi b/src/partvi
index 5963ff6..d3f691d 100755
--- a/src/partvi
+++ b/src/partvi
@@ -166,15 +166,19 @@ iterate_partitions()
 
                 require_var type
                 case "$type" in
-                        efi-system-partition|bios-grub|boot|samizdat-*) ;;
-                        dm-verity-hashes|dm-verity-data) require_var data_path ;;
-                        partition-table) ;;
+                    dm-verity-hashes|dm-verity-data)
+                            require_var data_path
+                            [ ! "$SKIP_ROOTFS_COPY" ] || continue
+                            ;;
+                        efi-system-partition|bios-grub|boot|samizdat-*|partition-table) ;;
                         *) die "invalid type: $type" ;;
                 esac
 
-                imgfile=$builddir/$img
+                case "$type" in
+                    dm-verity-data|dm-verity-hashes)
+                esac
 
-                check_for_key_only_skip || continue
+                imgfile=$builddir/$img
                 "$@" || return
         done
 }
@@ -266,15 +270,6 @@ pee_on_table()
         loudly $sudo sfdisk --no-tell-kernel -Y dos "$dev" < "$DOS_TABLE_FILE" || return
 }
 
-check_for_key_only_skip()
-{
-        [ "$KEY_ONLY" ] || return 0
-        case "$type" in
-                dm-verity-data|dm-verity-hashes) false ;;
-                *) true ;;
-        esac
-}
-
 clone_parts_to_target()
 {
 
@@ -300,10 +295,10 @@ cleanup()
     fi
 }
 
-KEY_ONLY=
+SKIP_ROOTFS_COPY=
 if [ "$1" = 'key' ]
 then
-    KEY_ONLY=y
+    SKIP_ROOTFS_COPY=y
 fi
 
 set -e
@@ -316,7 +311,7 @@ then sudo=
 else sudo=sudo
 fi
 
-if [ "$KEY_ONLY" ]
+if [ "$SKIP_ROOTFS_COPY" ]
 then
     target=key.img
 else