Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at Fri Aug 26 09:21:12 CEST 2011.
-------- --- sysconfig/sysconfig.changes 2011-08-10 05:05:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2011-08-25 14:44:40.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Aug 25 09:32:55 UTC 2011 - [email protected] + +- Add disable-NM-under-systemd.patch: don't handle NM startup with + network initscript when running under systemd. + +------------------------------------------------------------------- +Wed Aug 11 20:29:55 UTC 2011 - [email protected] + +- Fixed to apply wireless power settings and allow any setting as + defined in the iwconfig(8) manual page. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- disable-NM-under-systemd.patch wireless-power-settings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.MQdAfq/_old 2011-08-26 09:20:41.000000000 +0200 +++ /var/tmp/diff_new_pack.MQdAfq/_new 2011-08-26 09:20:41.000000000 +0200 @@ -20,7 +20,7 @@ Name: sysconfig Version: 0.75.0 -Release: 5 +Release: 7 Summary: The system configuration scheme Url: http://gitorious.org/opensuse/sysconfig Group: System/Base @@ -32,6 +32,8 @@ Requires: iproute2 dbus-1 procps BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 +Patch0: disable-NM-under-systemd.patch +Patch1: wireless-power-settings.patch %description This package provides the SuSE system configuration scheme and @@ -51,6 +53,8 @@ %prep %setup -n sysconfig-%{version} +%patch0 -p1 +%patch1 -p1 %build autoreconf --force --install ++++++ disable-NM-under-systemd.patch ++++++ >From b53cab083de6baafb6fd61186d164dc2a71cfcf7 Mon Sep 17 00:00:00 2001 From: Frederic Crozat <[email protected]> Date: Fri, 12 Aug 2011 16:03:48 +0200 Subject: [PATCH] Do not handle NetworkManager if running under systemd. NetworkManager should be using its own .service when used under systemd. --- scripts/network | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/scripts/network b/scripts/network index 5d8dc52..434dd66 100755 --- a/scripts/network +++ b/scripts/network @@ -102,6 +102,13 @@ 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 $? +} + + ###################################################################### # Start NetworkManager if wanted # @@ -110,9 +117,11 @@ 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 # NetworkManager is not supported without remotefs # and will be started later via network-remotefs. + # NetworkManager should be started with its own .service + # under systemd case $ACTION in (status) exit 3 ;; (start) exit 0 ;; -- 1.7.3.4 ++++++ wireless-power-settings.patch ++++++ >From 1ed12797eab1b75fcc01bf97081b71a4fa8e7090 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <[email protected]> Date: Wed, 11 May 2011 22:16:56 +0200 Subject: [PATCH] Apply wireless power settings when requested Fixed to apply wireless power settings and allow any setting as defined in the iwconfig(8) manual page. Signed-off-by: Marius Tomaschewski <[email protected]> --- config/ifcfg.template | 6 ++++-- scripts/ifup-wireless | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/config/ifcfg.template b/config/ifcfg.template index d0e1b6d..d7f0f75 100644 --- a/config/ifcfg.template +++ b/config/ifcfg.template @@ -612,10 +612,12 @@ PREFER_WPA_SUPPLICANT='' # Ad-Hoc modes when the variable is empty. WIRELESS_AP='' -## Type: string(yes,no,none) +## Type: string(yes,no,off,none,) ## Default: "none" # -# Can be set to yes, no, none (default). +# Used to manipulate power management scheme parameters and mode. +# Can be set to 'yes', 'no' or 'off', 'none' (default) or to a setting +# defined in iwconfig(8) manual page. # If set to none, ifup will not manipulate power saving for this device. # If set to no, ifup tries to disable power saving for this device. # If set to yes, ifup tries to enable power saving for this device. This diff --git a/scripts/ifup-wireless b/scripts/ifup-wireless index 105ebe9..3f83f50 100755 --- a/scripts/ifup-wireless +++ b/scripts/ifup-wireless @@ -776,6 +776,14 @@ case $ACTION in PREFER_WPA_SUPPLICANT=no ;; esac + + case $WIRELESS_POWER in + ""|none) ;; + no|off) run_iw_tool config power off ;; + yes) run_iw_tool config power period 2 ;; + *) run_iw_tool config power $WIRELESS_POWER ;; + esac + if need_wpa_supplicant ; then info_mesg "configuration requires wpa_supplicant" set_default_wpa_driver -- 1.7.3.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
