Mailinglist Archive: opensuse-commit (794 mails)
| < Previous | Next > |
commit sysconfig for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 21 Sep 2009 21:34:45 +0200
- Message-id: <20090921193445.737B062F7@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package sysconfig for openSUSE:Factory
checked in at Mon Sep 21 21:34:45 CEST 2009.
--------
--- sysconfig/sysconfig.changes 2009-09-09 13:09:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2009-09-15
12:45:01.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Sep 15 12:07:46 CEST 2009 - mt@xxxxxxx
+
+- version 0.72.4
+- Added note to WIRELESS_REGULATORY_DOMAIN variable description in
+ /etc/sysconfig/network/config, that it needs the new nl80211 wpa
+ driver, that can be enabled using the WIRELESS_WPA_DRIVER ifcfg
+ variable on a per interface basis (bnc#537708).
+- Fixed typo in md-on-iscsi-automount 81-mount.rules (bnc#509495).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
sysconfig-0.72.3.tar.bz2
sysconfig-allow-per-dhcp-client-user-options.bnc524695.diff
sysconfig-dhcp-avoid-syslog-reload.fate305702.diff
sysconfig-nm-online-no-exit.bnc515629.diff
sysconfig-wireless-regulatory-domain.fate305301.diff
New:
----
sysconfig-0.72.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sysconfig.spec ++++++
--- /var/tmp/diff_new_pack.DEF0ZP/_old 2009-09-21 21:33:53.000000000 +0200
+++ /var/tmp/diff_new_pack.DEF0ZP/_new 2009-09-21 21:33:53.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package sysconfig (Version 0.72.3)
+# spec file for package sysconfig (Version 0.72.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,8 +19,8 @@
Name: sysconfig
-Version: 0.72.3
-Release: 2
+Version: 0.72.4
+Release: 1
Summary: The sysconfig scheme
Group: System/Base
License: GPL v2 or later
@@ -29,10 +29,6 @@
Requires: iproute2 dbus-1 hal procps
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %name-%version.tar.bz2
-Patch1: sysconfig-nm-online-no-exit.bnc515629.diff
-Patch2: sysconfig-allow-per-dhcp-client-user-options.bnc524695.diff
-Patch3: sysconfig-dhcp-avoid-syslog-reload.fate305702.diff
-Patch4: sysconfig-wireless-regulatory-domain.fate305301.diff
%description
This package provides the SuSE system configuration scheme.
@@ -53,10 +49,6 @@
%prep
%setup -n sysconfig-%{version}
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
%build
autoreconf --force --install
++++++ sysconfig-0.72.3.tar.bz2 -> sysconfig-0.72.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysconfig-0.72.3/ChangeLog
new/sysconfig-0.72.4/ChangeLog
--- old/sysconfig-0.72.3/ChangeLog 2009-08-13 13:42:32.000000000 +0200
+++ new/sysconfig-0.72.4/ChangeLog 2009-09-15 12:46:11.000000000 +0200
@@ -1,4 +1,91 @@
------------------------------------------------------------------------
+r1895 | mt | 2009-09-15 12:42:42 +0200 (Tue, 15 Sep 2009) | 2 lines
+Changed paths:
+ M /trunk/package/sysconfig.changes
+
+- Added bug number 537708
+
+------------------------------------------------------------------------
+r1892 | mt | 2009-09-15 12:37:16 +0200 (Tue, 15 Sep 2009) | 6 lines
+Changed paths:
+ M /trunk/config/sysconfig.config-network
+ M /trunk/package/sysconfig.changes
+
+- Added note to WIRELESS_REGULATORY_DOMAIN variable description in
+ /etc/sysconfig/network/config, that it needs the new nl80211 wpa
+ driver, that can be enabled using the WIRELESS_WPA_DRIVER ifcfg
+ variable on a per interface basis overriding our defaults.
+- Updated sysconfig.changes file.
+
+------------------------------------------------------------------------
+r1889 | mt | 2009-09-15 12:17:13 +0200 (Tue, 15 Sep 2009) | 2 lines
+Changed paths:
+ M /trunk/VERSION
+ M /trunk/package/sysconfig.changes
+
+- version 0.72.4, updated changes file
+
+------------------------------------------------------------------------
+r1888 | mt | 2009-09-15 12:16:38 +0200 (Tue, 15 Sep 2009) | 2 lines
+Changed paths:
+ M /trunk/config/hardware/81-mount.rules
+
+- Fixed typo in md-on-iscsi-automount 81-mount.rules (bnc#509495).
+
+------------------------------------------------------------------------
+r1887 | mt | 2009-09-15 08:48:10 +0200 (Tue, 15 Sep 2009) | 2 lines
+Changed paths:
+ M /trunk/package/sysconfig.changes
+
+- Updated changes file - in sync with openSUSE:Factory
+
+------------------------------------------------------------------------
+r1886 | mt | 2009-09-15 08:46:59 +0200 (Tue, 15 Sep 2009) | 2 lines
+Changed paths:
+ M /trunk/sysconfig.spec.in
+
+- Removed file check - sysconfig_remove_and_set makes it anyway
+
+------------------------------------------------------------------------
+r1885 | mt | 2009-09-15 08:43:42 +0200 (Tue, 15 Sep 2009) | 3 lines
+Changed paths:
+ M /trunk/config/sysconfig.config-network
+ M /trunk/scripts/ifup-wireless
+
+- Implemented support to set the wireless regulatory domain using
+ WIRELESS_REGULATORY_DOMAIN network/config variable (fate#305301).
+
+------------------------------------------------------------------------
+r1884 | mt | 2009-09-15 08:41:56 +0200 (Tue, 15 Sep 2009) | 3 lines
+Changed paths:
+ M /trunk/scripts/dhcpcd-hook
+ M /trunk/scripts/ifup-dhcp
+
+- Added check for hostname changes to avoid a syslog reload in
+ dhcpcd-hook when it didn't changed (fate#305702,bnc#466198).
+
+------------------------------------------------------------------------
+r1883 | mt | 2009-09-03 10:16:55 +0200 (Thu, 03 Sep 2009) | 6 lines
+Changed paths:
+ M /trunk/scripts/network
+
+- Fixed waiting for successful connection in NetworkManager in
+ the /etc/init.d/network script by removing nm-online's --exit
+ option, that caused to exit immediately instead of waiting up
+ to NM_ONLINE_TIMEOUT seconds, because the NetworkManager has
+ been started just now and not ready yet (bnc#515629).
+
+------------------------------------------------------------------------
+r1882 | mt | 2009-09-03 10:16:18 +0200 (Thu, 03 Sep 2009) | 4 lines
+Changed paths:
+ M /trunk/config/sysconfig.dhcp-network
+ M /trunk/scripts/ifup-dhcp
+
+- Added additional dhcp client specific start options variables
+ DHCPCD-, DHCLIENT- and DHCP6C_USER_OPTIONS, enabling the user
+ to set custom options in special cases (bnc#524695).
+
+------------------------------------------------------------------------
r1880 | mt | 2009-08-13 13:41:31 +0200 (Thu, 13 Aug 2009) | 2 lines
Changed paths:
M /trunk/VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysconfig-0.72.3/VERSION new/sysconfig-0.72.4/VERSION
--- old/sysconfig-0.72.3/VERSION 2009-08-12 14:19:54.000000000 +0200
+++ new/sysconfig-0.72.4/VERSION 2009-09-15 08:48:32.000000000 +0200
@@ -1 +1 @@
-0.72.3
+0.72.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysconfig-0.72.3/config/hardware/81-mount.rules
new/sysconfig-0.72.4/config/hardware/81-mount.rules
--- old/sysconfig-0.72.3/config/hardware/81-mount.rules 2009-08-04
09:47:54.000000000 +0200
+++ new/sysconfig-0.72.4/config/hardware/81-mount.rules 2009-09-15
12:15:36.000000000 +0200
@@ -5,7 +5,7 @@
ACTION=="add", SUBSYSTEM=="block", KERNEL=="md*", GOTO="skip_mount"
ACTION=="add", SUBSYSTEM=="block", ENV{FSTAB_OPTS}=="*nofail*",
IMPORT="udevmountd"
ACTION=="change", SUBSYSTEM=="block", KERNEL=="dm-*",
ENV{FSTAB_OPTS}=="*nofail*", IMPORT="udevmountd"
-ACTION=="change", SUBSYSTEM=="block", KERNEL=="md*",
ENV(FSTAB_OPTS)=="*nofail*", IMPORT="udevmountd"
+ACTION=="change", SUBSYSTEM=="block", KERNEL=="md*",
ENV{FSTAB_OPTS}=="*nofail*", IMPORT="udevmountd"
ACTION=="add|change", ENV{FSCK_STATE}=="unknown|clean", RUN+="udevmountd add"
ACTION=="remove", ENV{FSTAB_OPTS}=="*nofail*", RUN+="udevmountd remove"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysconfig-0.72.3/config/sysconfig.config-network
new/sysconfig-0.72.4/config/sysconfig.config-network
--- old/sysconfig-0.72.3/config/sysconfig.config-network 2008-12-11
17:34:42.000000000 +0100
+++ new/sysconfig-0.72.4/config/sysconfig.config-network 2009-09-15
12:31:59.000000000 +0200
@@ -297,3 +297,19 @@
#
NETCONFIG_NIS_STATIC_SERVERS=""
+## Type: string
+## Default: ''
+#
+# Set this variable to the ISO / IEC 3166 alpha2 country code
+# specifying the wireless regulatory domain to set.
+# When not-empty, it will be set in the wpa_supplicant config
+# or via 'iw reg set' command.
+#
+# Note: in wpa_supplicant mode, it is currently (openSUSE 11.2)
+# not supported by our default 'wext', but by the new 'nl80211'
+# wpa driver. You can set WIRELESS_WPA_DRIVER='nl80211' in the
+# per interface ifcfg config file. We will switch to use the
+# new driver as soon as we've tested it with more chipsets.
+#
+WIRELESS_REGULATORY_DOMAIN=''
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysconfig-0.72.3/config/sysconfig.dhcp-network
new/sysconfig-0.72.4/config/sysconfig.dhcp-network
--- old/sysconfig-0.72.3/config/sysconfig.dhcp-network 2008-12-11
17:34:42.000000000 +0100
+++ new/sysconfig-0.72.4/config/sysconfig.dhcp-network 2009-09-03
10:13:46.000000000 +0200
@@ -32,6 +32,33 @@
#
DHCLIENT6_BIN=""
+## Type: string
+## Default: ""
+## ServiceRestart: network
+#
+# Additional user start options to use when the 'dhcpcd' DHCPv4 client
+# is enabled in the DHCLIENT_BIN variable (default).
+#
+DHCPCD_USER_OPTIONS=""
+
+## Type: string
+## Default: ""
+## ServiceRestart: network
+#
+# Additional user start options to use when the 'dhclient' ISC DHCPv4
+# client is enabled in the DHCLIENT_BIN variable.
+#
+DHCLIENT_USER_OPTIONS=""
+
+## Type: string
+## Default: ""
+## ServiceRestart: network
+#
+# Additional user start options to use when the 'dhcp6c' DHCPv6 client
+# is enabled in the DHCLIENT6_BIN variable (default).
+#
+DHCP6C_USER_OPTIONS=""
+
## Type: yesno
## Default: no
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysconfig-0.72.3/configure
new/sysconfig-0.72.4/configure
--- old/sysconfig-0.72.3/configure 2009-08-13 13:42:15.000000000 +0200
+++ new/sysconfig-0.72.4/configure 2009-09-15 12:45:50.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.in Revision: 1.13 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for sysconfig 0.72.3.
+# Generated by GNU Autoconf 2.63 for sysconfig 0.72.4.
#
# Report bugs to <http://www.suse.de/feedback/>.
#
@@ -746,8 +746,8 @@
# Identity of this package.
PACKAGE_NAME='sysconfig'
PACKAGE_TARNAME='sysconfig'
-PACKAGE_VERSION='0.72.3'
-PACKAGE_STRING='sysconfig 0.72.3'
+PACKAGE_VERSION='0.72.4'
+PACKAGE_STRING='sysconfig 0.72.4'
PACKAGE_BUGREPORT='http://www.suse.de/feedback/'
ac_unique_file="scripts/ifup"
@@ -1479,7 +1479,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sysconfig 0.72.3 to adapt to many kinds of systems.
+\`configure' configures sysconfig 0.72.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1549,7 +1549,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sysconfig 0.72.3:";;
+ short | recursive ) echo "Configuration of sysconfig 0.72.4:";;
esac
cat <<\_ACEOF
@@ -1649,7 +1649,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sysconfig configure 0.72.3
+sysconfig configure 0.72.4
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1663,7 +1663,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sysconfig $as_me 0.72.3, which was
+It was created by sysconfig $as_me 0.72.4, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2383,7 +2383,7 @@
# Define the identity of the package.
PACKAGE='sysconfig'
- VERSION='0.72.3'
+ VERSION='0.72.4'
cat >>confdefs.h <<_ACEOF
@@ -12360,7 +12360,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sysconfig $as_me 0.72.3, which was
+This file was extended by sysconfig $as_me 0.72.4, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12414,7 +12414,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-sysconfig config.status 0.72.3
+sysconfig config.status 0.72.4
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysconfig-0.72.3/scripts/dhcpcd-hook
new/sysconfig-0.72.4/scripts/dhcpcd-hook
--- old/sysconfig-0.72.3/scripts/dhcpcd-hook 2008-10-16 10:12:54.000000000
+0200
+++ new/sysconfig-0.72.4/scripts/dhcpcd-hook 2009-09-15 08:42:00.000000000
+0200
@@ -19,7 +19,7 @@
#
# Author: Peter Poeml <poeml@xxxxxxx>
#
-# $Id: dhcpcd-hook 1769 2008-10-16 08:12:53Z mt $
+# $Id: dhcpcd-hook 1884 2009-09-15 06:41:56Z mt $
#
@@ -71,6 +71,9 @@
debug="$3"
action=""
+if [ -r /etc/sysconfig/network/scripts/functions ] ; then
+ . /etc/sysconfig/network/scripts/functions
+fi
if [ -r /etc/sysconfig/network/config ] ; then
. /etc/sysconfig/network/config
fi
@@ -110,6 +113,23 @@
esac
done < $leaseinfo
+hostname_changed()
+{
+ # check regardless the DHCLIENT_SET_HOSTNAME setting,
+ # because if it changed, we've to handle it anyway...
+
+ # read the previous hostname from state file, when it
+ # differs with current one, update the state and report.
+ OLD_HOSTNAME=`read_cached_config_data hostname $INTERFACE`
+ CUR_HOSTNAME=`hostname 2>/dev/null`
+ if test "x$OLD_HOSTNAME" != "x$CUR_HOSTNAME" ; then
+ write_cached_config_data hostname "$CUR_HOSTNAME" $INTERFACE
+ commit_cached_config_data $INTERFACE
+ return 0
+ else
+ return 1
+ fi
+}
case $state in
up)
@@ -121,8 +141,10 @@
-i $INTERFACE $NC_OPTIONS \
-l $leaseinfo 2>&1 | $log_dbg
- # reload syslog so it knows the new hostname
- /etc/init.d/syslog reload
+ if hostname_changed ; then
+ # reload syslog so it knows the new hostname
+ /etc/init.d/syslog reload
+ fi
;;
down)
# We now call PRE_DOWN_SCRIPT directly from ifdown, because it was
called
@@ -143,8 +165,10 @@
-i $INTERFACE $NC_OPTIONS \
< $leaseinfo 2>&1 | $log_dbg
- # reload syslog so it knows the new hostname
- /etc/init.d/syslog reload
+ if hostname_changed ; then
+ # reload syslog so it knows the new hostname
+ /etc/init.d/syslog reload
+ fi
$debug && $log_dbg "Running ifdown $INTERFACE -o dhcp"
ifdown $INTERFACE -o dhcp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysconfig-0.72.3/scripts/ifup-dhcp
new/sysconfig-0.72.4/scripts/ifup-dhcp
--- old/sysconfig-0.72.3/scripts/ifup-dhcp 2009-08-04 10:05:54.000000000
+0200
+++ new/sysconfig-0.72.4/scripts/ifup-dhcp 2009-09-15 08:42:00.000000000
+0200
@@ -18,7 +18,7 @@
# Author: Christian Zoz <zoz@xxxxxxx>, 2002-2006
# Peter Poeml <poeml@xxxxxxx>, 2002-2006
#
-# $Id: ifup-dhcp 1860 2009-08-04 08:05:53Z mt $
+# $Id: ifup-dhcp 1884 2009-09-15 06:41:56Z mt $
#
usage () {
@@ -311,10 +311,10 @@
args="$args${DHCLIENT_VENDOR_CLASS_ID:+ -i
\"$DHCLIENT_VENDOR_CLASS_ID\"}"
args="$args${DHCLIENT_LEASE_TIME:+ -l \"$DHCLIENT_LEASE_TIME\"}"
args="$args${DHCLIENT_HOSTNAME_OPTION:+ -h
\"$DHCLIENT_HOSTNAME_OPTION\"}"
- debug "Starting dhcp client: $DHCLIENT_BIN $args $INTERFACE"
+ debug "Starting dhcp client: $DHCLIENT_BIN $DHCPCD_USER_OPTIONS $args
$INTERFACE"
# now start dhcpcd
- $DHCLIENT_BIN $DHCLIENT_ARGS \
+ $DHCLIENT_BIN $DHCPCD_USER_OPTIONS $DHCLIENT_ARGS \
${DHCLIENT_TIMEOUT:+-t "$DHCLIENT_TIMEOUT"} \
${DHCLIENT_CLIENT_ID:+-I "$DHCLIENT_CLIENT_ID"} \
${DHCLIENT_VENDOR_CLASS_ID:+-i "$DHCLIENT_VENDOR_CLASS_ID"} \
@@ -354,8 +354,8 @@
{ print $0; }
' < /etc/dhclient.conf > "$DHCPIFCONF" || return 1
- debug "Starting dhcp client: $DHCLIENT_BIN -cf "$DHCPIFCONF" -lf
"$DHCPIFLEASE" -pf "$DHCPIFPID" $args $INTERFACE"
- $DHCLIENT_BIN -cf "$DHCPIFCONF" -lf "$DHCPIFLEASE" -pf "$DHCPIFPID"
$args $INTERFACE </dev/null &>/dev/null &
+ debug "Starting dhcp client: $DHCLIENT_BIN $DHCLIENT_USER_OPTIONS -cf
"$DHCPIFCONF" -lf "$DHCPIFLEASE" -pf "$DHCPIFPID" $args $INTERFACE"
+ $DHCLIENT_BIN $DHCLIENT_USER_OPTIONS -cf "$DHCPIFCONF" -lf
"$DHCPIFLEASE" -pf "$DHCPIFPID" $args $INTERFACE </dev/null &>/dev/null &
}
start_dhcp6_dhcp6c() {
@@ -380,8 +380,8 @@
echo "};"
} > "$DHCP6IFCONF" || return 1
- debug "Starting dhcp client: $DHCLIENT6_BIN $args $INTERFACE"
- $DHCLIENT6_BIN $args $INTERFACE </dev/null &>/dev/null &
+ debug "Starting dhcp client: $DHCLIENT6_BIN $DHCP6C_USER_OPTIONS $args
$INTERFACE"
+ $DHCLIENT6_BIN $DHCP6C_USER_OPTIONS $args $INTERFACE </dev/null
&>/dev/null &
}
case "$ACTION" in
@@ -553,6 +553,10 @@
test -f ./ifcfg-$CONFIG && . ./ifcfg-$CONFIG
fi
+ # remember the hostname to handle a change later
+ write_cached_config_data hostname "`hostname
2>/dev/null`" $INTERFACE
+ commit_cached_config_data $INTERFACE
+
debug "Activating interface $INTERFACE"
if ! is_iface_up $INTERFACE ; then
ip link set $INTERFACE up ${MTU:+mtu $MTU} \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysconfig-0.72.3/scripts/ifup-wireless
new/sysconfig-0.72.4/scripts/ifup-wireless
--- old/sysconfig-0.72.3/scripts/ifup-wireless 2009-08-12 14:19:46.000000000
+0200
+++ new/sysconfig-0.72.4/scripts/ifup-wireless 2009-09-15 08:43:46.000000000
+0200
@@ -19,7 +19,7 @@
#
# Author: Joachim Gleissner <jg@xxxxxxx>, 2005
#
-# $Id: ifup-wireless 1877 2009-08-12 12:19:45Z mt $
+# $Id: ifup-wireless 1885 2009-09-15 06:43:42Z mt $
#
usage () {
@@ -182,7 +182,7 @@
######################################################################
# check for needed tools
#
-for i in iwconfig hexdump sed awk ; do
+for i in iwconfig hexdump sed awk iw ; do
if [ -z "`type -p $i`" ] ; then
err_mesg "cannot find '$i', please install"
exit $R_ERROR
@@ -443,6 +443,16 @@
info_mesg "WIRELESS_MODE is unset, using Managed"
WIRELESS_MODE="Managed"
fi
+
+ # Set the wireless regulatory domain country code when configured
+ if [ "x$WIRELESS_REGULATORY_DOMAIN" != x ] ; then
+ CMD="iw reg set $WIRELESS_REGULATORY_DOMAIN"
+ OUT=`$CMD 2>&1` ; RET=$?
+ if [ "$RET" -ne "0" -o "x$OUT" != x ] ; then
+ err_mesg "command '$CMD' returned\n $OUT"
+ fi
+ fi
+
# some drivers seem to have extensions like wlan-ng,
# although they do not
case "$DRIVER" in
@@ -600,6 +610,7 @@
# header
echo "ctrl_interface=/var/run/wpa_supplicant"
test -n "$WIRELESS_AP_SCANMODE" && echo "ap_scan=$WIRELESS_AP_SCANMODE"
+ test -n "$WIRELESS_REGULATORY_DOMAIN" && echo
"country=$WIRELESS_REGULATORY_DOMAIN"
get_first_index
local index=$?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysconfig-0.72.3/scripts/network
new/sysconfig-0.72.4/scripts/network
--- old/sysconfig-0.72.3/scripts/network 2009-06-10 16:47:43.000000000
+0200
+++ new/sysconfig-0.72.4/scripts/network 2009-09-03 10:16:58.000000000
+0200
@@ -24,7 +24,7 @@
# Mads Martin J�rgensen <mmj@xxxxxxx>
# Marius Tomaschewski <mt@xxxxxxx>
#
-# $Id: network 1853 2009-06-10 14:47:41Z mt $
+# $Id: network 1883 2009-09-03 08:16:55Z mt $
#
# /etc/init.d/network
#
@@ -153,7 +153,7 @@
return 0
fi
local rc_startmode="${stat}${attn}waiting${norm}"
- $NM_ONLINE_BIN --exit --timeout $NM_ONLINE_TIMEOUT
+ $NM_ONLINE_BIN --timeout $NM_ONLINE_TIMEOUT
case $? in
0) rc_status -v ;;
1) echo -e "$rc_startmode" 1>&2 ;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysconfig-0.72.3/sysconfig.spec
new/sysconfig-0.72.4/sysconfig.spec
--- old/sysconfig-0.72.3/sysconfig.spec 2009-08-13 13:42:25.000000000 +0200
+++ new/sysconfig-0.72.4/sysconfig.spec 2009-09-15 12:45:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package sysconfig (Version 0.72.3)
+# spec file for package sysconfig (Version 0.72.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: sysconfig
-Version: 0.72.3
+Version: 0.72.4
Release: 0
Summary: The sysconfig scheme
Group: System/Base
@@ -215,10 +215,8 @@
#
%{fillup_and_insserv -fY network}
%{fillup_and_insserv -fY network-remotefs}
-if test -f etc/sysconfig/network/dhcp ; then
- # remove first, we need the new default value
- sysconfig_remove_and_set network/dhcp DHCLIENT_TIMEOUT
-fi
+# remove first, we need the new default value
+sysconfig_remove_and_set network/dhcp DHCLIENT_TIMEOUT
%{fillup_only -dns dhcp network network}
%{fillup_only -dns config network network}
/sbin/ldconfig
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysconfig-0.72.3/sysconfig.spec.in
new/sysconfig-0.72.4/sysconfig.spec.in
--- old/sysconfig-0.72.3/sysconfig.spec.in 2009-08-12 11:36:43.000000000
+0200
+++ new/sysconfig-0.72.4/sysconfig.spec.in 2009-09-15 08:45:54.000000000
+0200
@@ -215,10 +215,8 @@
#
%{fillup_and_insserv -fY network}
%{fillup_and_insserv -fY network-remotefs}
-if test -f etc/sysconfig/network/dhcp ; then
- # remove first, we need the new default value
- sysconfig_remove_and_set network/dhcp DHCLIENT_TIMEOUT
-fi
+# remove first, we need the new default value
+sysconfig_remove_and_set network/dhcp DHCLIENT_TIMEOUT
%{fillup_only -dns dhcp network network}
%{fillup_only -dns config network network}
/sbin/ldconfig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |