crypt/module-setup.sh: use crypttab in hostonly and don't install cmdline
authorHarald Hoyer <harald@redhat.com>
Mon, 12 Aug 2013 22:35:10 +0000 (00:35 +0200)
committerHarald Hoyer <harald@redhat.com>
Mon, 12 Aug 2013 22:35:10 +0000 (00:35 +0200)
modules.d/90crypt/module-setup.sh

index 68b5fbe..ac75f10 100755 (executable)
@@ -46,7 +46,6 @@ install() {
         return 0
     }
 
-    for_each_host_dev_fs check_crypt
 
     inst_multiple cryptsetup rmdir readlink umount
     inst_script "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
@@ -74,13 +73,14 @@ install() {
                 fi
             done
         done < /etc/crypttab > $initdir/etc/crypttab
+    else
+        for_each_host_dev_fs check_crypt
     fi
 
     inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
 
     inst_multiple -o \
         $systemdutildir/system-generators/systemd-cryptsetup-generator \
-        $systemdutildir/system-generators/systemd-cryptsetup-generator \
         $systemdutildir/systemd-cryptsetup \
         $systemdsystemunitdir/systemd-ask-password-console.path \
         $systemdsystemunitdir/systemd-ask-password-console.service \