dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=664
This commit is contained in:
Dr. Werner Fink 2014-06-10 15:30:38 +00:00 committed by Git OBS Bridge
parent 4468293a48
commit 5a21c0f57b
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
systemd-mini.changes
View File

@ -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 Tue Jun 10 11:11:55 UTC 2014 - werner@suse.de

8
systemd-mini.spec
View File

@ -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 # 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 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 %description
Systemd is a system and service manager, compatible with SysV and LSB Systemd is a system and service manager, compatible with SysV and LSB
init scripts for Linux. systemd provides aggressive parallelization 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 # disable "-l" option for fsck if it does not support new locking scheme
# compare with commit c343be283b7152554bac0c02493a4e1759c163f7 # compare with commit c343be283b7152554bac0c02493a4e1759c163f7
%if 0%{util_linux_version} < 22500 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 sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c
%endif fi
%build %build
cflags () cflags ()

5
systemd.changes
View File

@ -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 Tue Jun 10 11:11:55 UTC 2014 - werner@suse.de

8
systemd.spec
View File

@ -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 # 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 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 %description
Systemd is a system and service manager, compatible with SysV and LSB Systemd is a system and service manager, compatible with SysV and LSB
init scripts for Linux. systemd provides aggressive parallelization 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 # disable "-l" option for fsck if it does not support new locking scheme
# compare with commit c343be283b7152554bac0c02493a4e1759c163f7 # compare with commit c343be283b7152554bac0c02493a4e1759c163f7
%if 0%{util_linux_version} < 22500 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 sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c
%endif fi
%build %build
cflags () cflags ()