partvi: check that $GPG_INPUT_DIR is a directory

1 files changed, 11 insertions, 9 deletions

diff --git a/src/partvi b/src/partvi
index ad8d852..31f44dd 100755
--- a/src/partvi
+++ b/src/partvi
@@ -5,15 +5,6 @@ PATH=/sbin:$PATH
 : ${GRUB_CONFIG:=../conf/grub.cfg}
 samizdat_linux_dir=/
 
-if [ ! "$GPG_INPUT_DIR" ]
-then
-    for d in $GPG_INPUT_DIR /root/.gnupg /cdrom/gnupghome
-    do
-        $sudo [ -d "$d" ] || continue
-        GPG_INPUT_DIR=$d
-        break
-    done
-fi
 
 
 add_initrd()
@@ -291,6 +282,17 @@ cleanup()
     fi
 }
 
+if [ "$GPG_INPUT_DIR" ]
+then
+    $sudo [ -d "$GPG_INPUT_DIR" ]
+else
+    for d in /root/.gnupg /cdrom/gnupghome
+    do
+        $sudo [ -d "$d" ] || continue
+        GPG_INPUT_DIR=$d
+        break
+    done
+fi
 SKIP_ROOTFS_COPY=
 if [ "$1" = 'key' ]
 then