From 37bb173731ca1b0d2a4cb3c0de37c6a9da9711791127c38e4479fa33c954111f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 10 Jun 2014 15:30:38 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=664 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 10 +++++----- systemd.changes | 5 +++++ systemd.spec | 10 +++++----- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 26dbb209..c1a39877 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 10 15:29:49 UTC 2014 - werner@suse.de + +- Change detection of new locking scheme of fsck + ------------------------------------------------------------------- Tue Jun 10 11:11:55 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 9b6b5086..61787e83 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -613,8 +613,6 @@ Patch1031: 1031-udev-make-sure-we-always-get-change-for-the-disk.patch # PATCH-FIX-UPSTREAM 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch Patch1032: 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch -%define util_linux_version %(rpm -q util-linux --qf '%%{VERSION}' | awk -F . '{printf "%%2.2d%%2.2d%%2.2d", $1, $2, $3}') - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -1084,9 +1082,11 @@ rm -f units/emergency.service # disable "-l" option for fsck if it does not support new locking scheme # compare with commit c343be283b7152554bac0c02493a4e1759c163f7 -%if 0%{util_linux_version} < 22500 -sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c -%endif +PATH_FSCK=$(type -p fsck) +if grep -q /run/fsck/%%s\\.lock $PATH_FSCK +then + sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c +fi %build cflags () diff --git a/systemd.changes b/systemd.changes index 26dbb209..c1a39877 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 10 15:29:49 UTC 2014 - werner@suse.de + +- Change detection of new locking scheme of fsck + ------------------------------------------------------------------- Tue Jun 10 11:11:55 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 1165efc6..90619c6f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -608,8 +608,6 @@ Patch1031: 1031-udev-make-sure-we-always-get-change-for-the-disk.patch # PATCH-FIX-UPSTREAM 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch Patch1032: 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch -%define util_linux_version %(rpm -q util-linux --qf '%%{VERSION}' | awk -F . '{printf "%%2.2d%%2.2d%%2.2d", $1, $2, $3}') - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -1079,9 +1077,11 @@ rm -f units/emergency.service # disable "-l" option for fsck if it does not support new locking scheme # compare with commit c343be283b7152554bac0c02493a4e1759c163f7 -%if 0%{util_linux_version} < 22500 -sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c -%endif +PATH_FSCK=$(type -p fsck) +if grep -q /run/fsck/%%s\\.lock $PATH_FSCK +then + sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c +fi %build cflags ()