forked from pool/systemd
.
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=664
This commit is contained in:
parent
7bfc2e7423
commit
37bb173731
@ -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
|
||||
|
||||
|
@ -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 ()
|
||||
|
@ -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
|
||||
|
||||
|
10
systemd.spec
10
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 ()
|
||||
|
Loading…
Reference in New Issue
Block a user