From d8babb901ca0a57e3dac8d48448facf7fb46937a2a4eba1c22f6ddb2ecb6728d Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Thu, 4 Aug 2011 16:01:04 +0000 Subject: [PATCH] - 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. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=173 --- root-fsck.patch | 25 ------------------------- systemd-cryptsetup-query.patch | 28 ++++++++++++++++++++++++++++ systemd-cryptsetup.patch | 25 +++++++++++++++++++++++++ systemd.changes | 10 ++++++++++ systemd.spec | 7 +++++-- 5 files changed, 68 insertions(+), 27 deletions(-) delete mode 100644 root-fsck.patch create mode 100644 systemd-cryptsetup-query.patch create mode 100644 systemd-cryptsetup.patch diff --git a/root-fsck.patch b/root-fsck.patch deleted file mode 100644 index f9ca4f00..00000000 --- a/root-fsck.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 687d70cc43b34eb2359598d0ca0b69e996aa1b38 Mon Sep 17 00:00:00 2001 -From: Frederic Crozat -Date: Wed, 3 Aug 2011 16:46:52 +0200 -Subject: [PATCH] units: detect SUSE initrd and do not run fsck on /. - ---- - units/fsck-root.service.in | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/units/fsck-root.service.in b/units/fsck-root.service.in -index 7b3529d..2f8c8f5 100644 ---- a/units/fsck-root.service.in -+++ b/units/fsck-root.service.in -@@ -13,6 +13,8 @@ Before=local-fs.target shutdown.target - - # Dracut informs us with this flag file if the root fsck was already run - ConditionPathExists=!/run/initramfs/root-fsck -+# Detect SUSE initrd too -+ConditionPathExists=!/dev/shm/initrd_exports.sh - - [Service] - Type=oneshot --- -1.7.3.4 - diff --git a/systemd-cryptsetup-query.patch b/systemd-cryptsetup-query.patch new file mode 100644 index 00000000..00f60c87 --- /dev/null +++ b/systemd-cryptsetup-query.patch @@ -0,0 +1,28 @@ +From d58446e4b3217f97baca7961154813a563ccdd19 Mon Sep 17 00:00:00 2001 +From: Frederic Crozat +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 + diff --git a/systemd-cryptsetup.patch b/systemd-cryptsetup.patch new file mode 100644 index 00000000..7e02d279 --- /dev/null +++ b/systemd-cryptsetup.patch @@ -0,0 +1,25 @@ +From aa5f34f2109a02db7887c220c5a35b6a8ee3e6c8 Mon Sep 17 00:00:00 2001 +From: Frederic Crozat +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 + diff --git a/systemd.changes b/systemd.changes index 3e8caacd..c7a7547a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 4 15:59:58 UTC 2011 - fcrozat@suse.com + +- 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. + ------------------------------------------------------------------- Wed Aug 3 16:03:25 UTC 2011 - fcrozat@suse.com diff --git a/systemd.spec b/systemd.spec index 68c0413f..9fe933a0 100644 --- a/systemd.spec +++ b/systemd.spec @@ -56,8 +56,10 @@ Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch # an exception will be silently removed with the next version update. # PATCH-FIX-UPSTREAM aj@suse.de gperf: Include missing.h Patch2: gperf-missing.patch -# PATCH-FIX-UPSTREAM fcrozat@suse.com -- don't run fsck on rw / -Patch3: root-fsck.patch +# PATCH-FIX-UPSTREAM fcrozat@suse.com -- accept none option in crypttab +Patch3: systemd-cryptsetup.patch +# PATCH-FIX-UPSTREAM fcrozat@suse.com -- 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 @@ Plymouth integration for systemd %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build autoreconf -fiv