Hello community,

here is the log from the commit of package systemd for openSUSE:Factory
checked in at Sat Aug 6 19:20:30 CEST 2011.



--------
--- systemd/systemd.changes     2011-08-03 18:32:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/systemd/systemd.changes        2011-08-04 
18:01:03.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Aug  4 15:59:58 UTC 2011 - [email protected]
+
+- Remove root-fsck.patch, mkinitrd will use the same path as
+  dracut.
+- Add systemd-cryptsetup.patch: don't complain on "none" option in
+  crypttab.
+- Add systemd-cryptsetup-query.patch: block boot until passphrase
+  is typed.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  root-fsck.patch

New:
----
  systemd-cryptsetup-query.patch
  systemd-cryptsetup.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.d7RCKO/_old  2011-08-06 19:20:00.000000000 +0200
+++ /var/tmp/diff_new_pack.d7RCKO/_new  2011-08-06 19:20:00.000000000 +0200
@@ -22,7 +22,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        33
-Release:        1
+Release:        7
 License:        GPLv2+
 Group:          System/Base
 Summary:        A System and Session Manager
@@ -56,8 +56,10 @@
 # an exception will be silently removed with the next version update.
 # PATCH-FIX-UPSTREAM [email protected] gperf: Include missing.h
 Patch2:         gperf-missing.patch
-# PATCH-FIX-UPSTREAM [email protected] -- don't run fsck on rw /
-Patch3:         root-fsck.patch
+# PATCH-FIX-UPSTREAM [email protected] -- accept none option in crypttab
+Patch3:         systemd-cryptsetup.patch
+# PATCH-FIX-UPSTREAM [email protected] -- don't set getty before passphrase is 
typed
+Patch4:         systemd-cryptsetup-query.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -118,6 +120,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 autoreconf -fiv

++++++ systemd-cryptsetup-query.patch ++++++
>From d58446e4b3217f97baca7961154813a563ccdd19 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <[email protected]>
Date: Thu, 4 Aug 2011 16:46:33 +0200
Subject: [PATCH] cryptsetup-generator: block boot when querying passphrase.

Ensure we wait for passphrase before starting tty1 or graphical display.
Needed when not using plymouth.
---
 src/cryptsetup-generator.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
index a340218..6f3aa78 100644
--- a/src/cryptsetup-generator.c
+++ b/src/cryptsetup-generator.c
@@ -112,7 +112,8 @@ static int create_disk(
                 "DefaultDependencies=no\n"
                 "BindTo=%s dev-mapper-%%i.device\n"
                 "After=systemd-readahead-collect.service 
systemd-readahead-replay.service %s\n"
-                "Before=umount.target\n",
+                "Before=umount.target\n"
+                "Before=local-fs.target\n",
                 d, d);
 
         if (!nofail)
-- 
1.7.3.4

++++++ systemd-cryptsetup.patch ++++++
>From aa5f34f2109a02db7887c220c5a35b6a8ee3e6c8 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <[email protected]>
Date: Thu, 4 Aug 2011 16:04:43 +0200
Subject: [PATCH] cryptsetup: accept "none" option

---
 src/cryptsetup.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index cf288de..ac7b6d6 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -110,7 +110,7 @@ static int parse_one_option(const char *option) {
                         return 0;
                 }
 
-        } else
+        } else if (!streq(option, "none"))
                 log_error("Encountered unknown /etc/crypttab option '%s', 
ignoring.", option);
 
         return 0;
-- 
1.7.3.4


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to