Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at Tue Aug 30 10:45:32 CEST 2011. -------- --- sysconfig/sysconfig.changes 2011-08-27 00:14:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2011-08-29 12:04:04.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 29 10:03:13 UTC 2011 - fcrozat@suse.com + +- Fix incorrect systemd detection in disable-NM-under-systemd.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.zN9RAi/_old 2011-08-30 10:43:56.000000000 +0200 +++ /var/tmp/diff_new_pack.zN9RAi/_new 2011-08-30 10:43:56.000000000 +0200 @@ -20,7 +20,7 @@ Name: sysconfig Version: 0.75.0 -Release: 9 +Release: 11 Summary: The system configuration scheme Url: http://gitorious.org/opensuse/sysconfig Group: System/Base ++++++ disable-NM-under-systemd.patch ++++++ --- /var/tmp/diff_new_pack.zN9RAi/_old 2011-08-30 10:43:56.000000000 +0200 +++ /var/tmp/diff_new_pack.zN9RAi/_new 2011-08-30 10:43:56.000000000 +0200 @@ -1,4 +1,4 @@ -From b53cab083de6baafb6fd61186d164dc2a71cfcf7 Mon Sep 17 00:00:00 2001 +From 169a6de5ce15a6c91856d7b25cccc51851e1b736 Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcrozat@suse.com> Date: Fri, 12 Aug 2011 16:03:48 +0200 Subject: [PATCH] Do not handle NetworkManager if running under systemd. @@ -6,33 +6,36 @@ NetworkManager should be using its own .service when used under systemd. --- - scripts/network | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) + scripts/network | 14 +++++++++++++- + 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/scripts/network b/scripts/network -index 5d8dc52..434dd66 100755 +index 5d8dc52..e763018 100755 --- a/scripts/network +++ b/scripts/network -@@ -102,6 +102,13 @@ test -f scripts/functions.common \ +@@ -102,6 +102,15 @@ test -f scripts/functions.common \ || exit $R_INTERNAL +systemd_running () { +# We simply test whether systemd cgroup hierarchy is mounted -+ /bin/mountpoint -q /sys/fs/cgroup/systemd -+ return $? ++ if /bin/mountpoint -q /sys/fs/cgroup/systemd ; then ++ return 1 ++ fi ++ return 0 +} + + ###################################################################### # Start NetworkManager if wanted # -@@ -110,9 +117,11 @@ test -f scripts/functions.common \ +@@ -110,9 +119,12 @@ test -f scripts/functions.common \ # because they are also used in ifup # if [ "$NETWORKMANAGER" = yes ] ; then - if [ "$FS_FILTER" = "localfs" ] ; then -+ if [ "$FS_FILTER" = "localfs" -o systemd_running ] ; then ++ systemd_running ; sd=$? ++ if [ "$FS_FILTER" = "localfs" -o $sd = 1 ] ; then # NetworkManager is not supported without remotefs # and will be started later via network-remotefs. + # NetworkManager should be started with its own .service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org