Accepting request 335670 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/335670
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=78

0181-no_systemd_cryptsetup.patch

@@ -17,10 +17,9 @@ Signed-off-by: Fabian Vogt <fvogt@suse.com>
  3 files changed, 60 deletions(-)
  delete mode 100755 modules.d/90crypt/crypt-run-generator.sh
 
-diff --git a/modules.d/90crypt/crypt-run-generator.sh b/modules.d/90crypt/crypt-run-generator.sh
-deleted file mode 100755
-index 3c5d7b1..0000000
---- a/modules.d/90crypt/crypt-run-generator.sh
+Index: dracut-043/modules.d/90crypt/crypt-run-generator.sh
+===================================================================
+--- dracut-043.orig/modules.d/90crypt/crypt-run-generator.sh
 +++ /dev/null
 @@ -1,31 +0,0 @@
 -#!/bin/sh
@@ -54,10 +53,10 @@ index 3c5d7b1..0000000
 -    systemctl start cryptsetup.target
 -fi
 -exit 0
-diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
-index 721b447..a73e4ee 100755
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
+Index: dracut-043/modules.d/90crypt/module-setup.sh
+===================================================================
+--- dracut-043.orig/modules.d/90crypt/module-setup.sh
++++ dracut-043/modules.d/90crypt/module-setup.sh
 @@ -89,14 +89,5 @@ install() {
      inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
      inst_simple "/tmp/dracut_block_uuid.map" "/usr/lib/dracut/modules.d/90crypt/block_uuid.map"
@@ -73,10 +72,10 @@ index 721b447..a73e4ee 100755
 -    inst_script "$moddir"/crypt-run-generator.sh /sbin/crypt-run-generator
      dracut_need_initqueue
  }
-diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh
-index 5bda006..d84ff62 100755
---- a/modules.d/90crypt/parse-crypt.sh
-+++ b/modules.d/90crypt/parse-crypt.sh
+Index: dracut-043/modules.d/90crypt/parse-crypt.sh
+===================================================================
+--- dracut-043.orig/modules.d/90crypt/parse-crypt.sh
++++ dracut-043/modules.d/90crypt/parse-crypt.sh
 @@ -25,7 +25,6 @@ else
  
              luksid=${luksid##luks-}
@@ -123,6 +122,16 @@ index 5bda006..d84ff62 100755
      fi
  
      echo 'LABEL="luks_end"' >> /etc/udev/rules.d/70-luks.rules.new
--- 
-2.5.1
-
+Index: dracut-043/modules.d/90crypt/crypt-lib.sh
+===================================================================
+--- dracut-043.orig/modules.d/90crypt/crypt-lib.sh
++++ dracut-043/modules.d/90crypt/crypt-lib.sh
+@@ -90,7 +90,7 @@ ask_for_password() {
+ 
+             [ "$tty_echo_off" = yes ] && stty $stty_orig
+         fi
+-    } 9>/.console_lock
++    } <> /dev/tty0 >&0 2>&1 9>/.console_lock
+ 
+     [ $ret -ne 0 ] && echo "Wrong password" >&2
+     return $ret

dracut.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Oct  1 12:44:28 UTC 2015 - fvogt@suse.com
+
+- Fix 0181-no_systemd_cryptsetup.patch:
+   - Password input without plymouth didn't work
+
+-------------------------------------------------------------------
+Thu Oct  1 10:02:21 UTC 2015 - dimstar@opensuse.org
+
+- Disable 0181-no_systemd_cryptsetup.patch: it breaks existing
+  installations of encrypted / on LVM.
+
 -------------------------------------------------------------------
 Wed Sep 23 11:26:05 UTC 2015 - fvogt@suse.com
 

dracut.spec

@@ -246,7 +246,8 @@ and its cryptography during startup.
 %patch165 -p1
 %patch168 -p1
 %patch180 -p1
-%patch181 -p1
+# disabled, as it breaks encrypted / on LVM - dimstar, 20151001
+#patch181 -p1
 %patch182 -p1
 %patch183 -p1