Hello community, here is the log from the commit of package sysconfig for openSUSE:12.1:Update:Test checked in at 2012-01-11 18:28:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/sysconfig (Old) and /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/sysconfig/sysconfig.changes 2011-12-19 18:24:18.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new/sysconfig.changes 2012-01-11 18:28:44.000000000 +0100 @@ -1,0 +2,25 @@ +Tue Jan 10 09:46:26 UTC 2012 - [email protected] + +- Explicitly disabled posix mode in all bash scripts as we are + using several features not supported in posix mode (bnc#739338). + +------------------------------------------------------------------ +Thu Jan 5 17:48:18 UTC 2012 - [email protected] + +- Fixed ipv6 dad / link ready wait time calculation (1/10 of the + specified time) and replaced useless up flag check loop with + link_ready_wait to avoid send errors from dhclient6 (bnc#697929). + +------------------------------------------------------------------ +Wed Jan 4 18:40:19 UTC 2012 - [email protected] + +- Added to require vlan, bridge-utils and tunctl packages via spec, + that are often required in base networking configurations and + are missed otherwise in 2nd installation stage, that may be + unable to install them for some reason (bnc#733118). +- Added X-Systemd-RemainAfterExit: true LSB header (bnc#727771) +- Do not suggest dhcp6c client from dropped dhcpv6 package + in ifup-dhcp, marked dhcp6c as deprecated in network/dhcp + and changed to use dhclient6 as first choice (bnc#734723). + +------------------------------------------------------------------ New: ---- 0004-Do-not-suggest-dropped-dhcp6c-client.patch 0005-Added-X-Systemd-RemainAfterExit-true-LSB-init-header.patch 0006-Fixed-ipv6-dad-link-ready-wait-time-calculation.patch 0007-Use-link_ready_wait-instead-of-up-flag-check-loop.patch 0008-Disabled-bash-posix-mode-to-allow-bash-features.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.crTTCZ/_old 2012-01-11 18:28:44.000000000 +0100 +++ /var/tmp/diff_new_pack.crTTCZ/_new 2012-01-11 18:28:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sysconfig # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,7 @@ # + Name: sysconfig Version: 0.75.4 Release: 0 @@ -26,12 +27,17 @@ PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep # we may create these automatically from rpm later Provides: sysvinit(network) -Requires: iproute2 dbus-1 procps +Requires: iproute2 dbus-1 procps vlan bridge-utils tunctl BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 Patch1: 0001-sysconfig-nm-online-timeout-0-default.patch Patch2: 0002-Fixed-order-of-addr-flush-and-link-down-in-ifdown.patch Patch3: 0003-CVE-2011-4182-fixed-quoting-in-ifservices-script.patch +Patch4: 0004-Do-not-suggest-dropped-dhcp6c-client.patch +Patch5: 0005-Added-X-Systemd-RemainAfterExit-true-LSB-init-header.patch +Patch6: 0006-Fixed-ipv6-dad-link-ready-wait-time-calculation.patch +Patch7: 0007-Use-link_ready_wait-instead-of-up-flag-check-loop.patch +Patch8: 0008-Disabled-bash-posix-mode-to-allow-bash-features.patch %description This package provides the SuSE system configuration scheme and @@ -54,6 +60,11 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build autoreconf --force --install ++++++ 0004-Do-not-suggest-dropped-dhcp6c-client.patch ++++++ >From b4a890149ada6af9b506c9c46157d4446b71c04a Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <[email protected]> Date: Mon, 5 Dec 2011 17:36:22 +0100 Subject: [PATCH] Do not suggest dropped dhcp6c client Do not suggest dhcp6c client from dropped dhcpv6 package in ifup-dhcp, marked dhcp6c as deprecated in network/dhcp and changed to use dhclient6 as first choice (bnc#734723). Signed-off-by: Marius Tomaschewski <[email protected]> --- config/sysconfig.dhcp-network | 13 ++++++++----- scripts/ifup-dhcp | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/config/sysconfig.dhcp-network b/config/sysconfig.dhcp-network index 3a5c21e..17c9688 100644 --- a/config/sysconfig.dhcp-network +++ b/config/sysconfig.dhcp-network @@ -16,23 +16,26 @@ # of these options -- NetworkManager is not using any sysconfig settings. # -## Type: string +## Type: list(dhcpcd,dhclient,) ## Default: "" ## ServiceRestart: network # # Which DHCPv4 client should be used? -# If empty, dhcpcd is tried, then dhclient -# Other possible values: +# Currently the following client are supported: # dhcpcd (DHCP client daemon) # dhclient (ISC dhclient) +# If empty, dhcpcd is tried, then dhclient DHCLIENT_BIN="" -## Type: string +## Type: list(dhclient6,) ## Default: "" ## ServiceRestart: network # # Which DHCPv6 client should be used? -# Currently only the dhcp6c client is supported. +# Currently the following client are supported: +# dhclient6 (ISC dhcp 4.x client) +# dhcp6c (dhcpv6 client -- deprecated, package dropped) +# If empty, dhclient6 is tried, then dhcp6c # DHCLIENT6_BIN="" diff --git a/scripts/ifup-dhcp b/scripts/ifup-dhcp index 1052a16..8315f92 100755 --- a/scripts/ifup-dhcp +++ b/scripts/ifup-dhcp @@ -174,7 +174,7 @@ done DHCLIENT6="" for x in "$DHCLIENT6_BIN" \ "/sbin/${DHCLIENT6_BIN##*/}" \ - "/sbin/dhcp6c" "/sbin/dhclient6" ; + "/sbin/dhclient6" "/sbin/dhcp6c" ; do if [ "x$x" != x -a "${x##/*}" != "$x" -a -x "$x" ] ; then DHCLIENT6_BIN="$x" @@ -255,14 +255,14 @@ case "$ACTION" in print_mesg err_mesg \ "DHCP6 client ($DHCLIENT6_BIN) is not available." print_mesg err_mesg \ - " Please install the 'dhcpv6' or 'dhcp-client' package" + " Please install the 'dhcp-client' package" fi ;; "") if [ "x$explicit_dhcp6" = "xyes" ] ; then if [ "x$HAVE_IPv6" = xyes ] ; then print_mesg err_mesg "DHCP6 client is not available." - print_mesg err_mesg " Please install 'dhcpv6' or 'dhcp-client' package'" + print_mesg err_mesg " Please install 'dhcp-client' package'" else print_mesg err_mesg "DHCP6 disabled - no IPv6 support" fi @@ -271,7 +271,7 @@ case "$ACTION" in *) DHCLIENT6="" print_mesg err_mesg "DHCP6 client unknown/unsupported: $DHCLIENT6_BIN" - print_mesg err_mesg " Please install the 'dhcpv6' or 'dhcp-client' package" + print_mesg err_mesg " Please install the 'dhcp-client' package" ;; esac ;; -- 1.7.7 ++++++ 0005-Added-X-Systemd-RemainAfterExit-true-LSB-init-header.patch ++++++ >From 274cae3140475adf57db9c02c6f4eba4a2b2eeb9 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <[email protected]> Date: Mon, 5 Dec 2011 17:40:13 +0100 Subject: [PATCH] Added X-Systemd-RemainAfterExit: true LSB init header Signed-off-by: Marius Tomaschewski <[email protected]> --- scripts/network | 1 + scripts/network-remotefs | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/scripts/network b/scripts/network index e5044b3..05edcca 100755 --- a/scripts/network +++ b/scripts/network @@ -39,6 +39,7 @@ # Short-Description: Configure the localfs depending network interfaces # Description: Configure the localfs depending network interfaces # and set up routing +# X-Systemd-RemainAfterExit: true ### END INIT INFO . /etc/rc.status diff --git a/scripts/network-remotefs b/scripts/network-remotefs index addc398..11eb040 100755 --- a/scripts/network-remotefs +++ b/scripts/network-remotefs @@ -35,6 +35,8 @@ # Short-Description: Configure the remote-fs depending network interfaces # Description: Configure the remote-fs depending network interfaces as # Wireless and set up routing or start the NetworkManager +# (except we're running under systemd). +# X-Systemd-RemainAfterExit: true ### END INIT INFO . /etc/rc.status -- 1.7.7 ++++++ 0006-Fixed-ipv6-dad-link-ready-wait-time-calculation.patch ++++++ >From de6254ddb293a9f26855e9111e42e1af2b5f1355 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <[email protected]> Date: Thu, 5 Jan 2012 17:50:10 +0100 Subject: [PATCH] Fixed ipv6 dad / link ready wait time calculation (bnc#697929) Signed-off-by: Marius Tomaschewski <[email protected]> --- scripts/functions | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/functions b/scripts/functions index e69c733..9bf48d2 100644 --- a/scripts/functions +++ b/scripts/functions @@ -163,7 +163,7 @@ link_ready_wait () local iface=$1 local -i wsecs=${2:-0} local -i uwait=25000 - local -i loops=$(((wsecs * 100000) / $uwait)) + local -i loops=$(((wsecs * 1000000) / $uwait)) local -i loop=0 ret=0 link_ready_check "$iface" ; ret=$? @@ -179,7 +179,7 @@ ipv6_addr_dad_wait() local iface=$1 local -i wsecs=${2:-0} local -i uwait=25000 - local -i loops=$(((wsecs * 100000) / $uwait)) + local -i loops=$(((wsecs * 1000000) / $uwait)) local -i loop=0 ret=0 ipv6_addr_dad_check "$iface" ; ret=$? -- 1.7.7 ++++++ 0007-Use-link_ready_wait-instead-of-up-flag-check-loop.patch ++++++ >From de8b5666d145d0846f7e031f5ce2e7cc70417763 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <[email protected]> Date: Thu, 5 Jan 2012 17:56:33 +0100 Subject: [PATCH] Use link_ready_wait instead of up flag check loop A loop checking the link UP flag was immediately successful and thus useless. Use a short 3 sec link_ready_wait instead to give the kernel some time to apply scope local address and start async tasks like IPv6 dad and avoid some of the initial send errors reported by dhclient6 (bnc#697929). Signed-off-by: Marius Tomaschewski <[email protected]> --- scripts/ifup-dhcp | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/ifup-dhcp b/scripts/ifup-dhcp index 8315f92..e42e615 100755 --- a/scripts/ifup-dhcp +++ b/scripts/ifup-dhcp @@ -677,12 +677,12 @@ case "$ACTION" in debug "Activating interface $INTERFACE" if ! is_iface_up $INTERFACE ; then + ip link set $INTERFACE up ${MTU:+mtu $MTU} \ ${LLADDR:+address $LLADDR} $LINK_OPTIONS - for ((count=200; count >= 0; count--)) ; do - is_iface_up $INTERFACE && break - usleep 25000 - done + + # wait a bit or dhclient(6) may produce false send errors + link_ready_wait "$INTERFACE" 3 # (optionally) wait until a device is really configured sleep ${DHCLIENT_SLEEP:-0} -- 1.7.7 ++++++ 0008-Disabled-bash-posix-mode-to-allow-bash-features.patch ++++++ >From e2b9aae8ff1601b9a93038eba7eadc4cc4a9718a Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <[email protected]> Date: Mon, 9 Jan 2012 19:56:52 +0100 Subject: [PATCH] Disabled bash posix mode to allow bash features Signed-off-by: Marius Tomaschewski <[email protected]> --- scripts/convert_to_netconfig_dns | 2 ++ scripts/convert_to_netconfig_nis | 2 ++ scripts/functions.rpm-utils | 2 ++ scripts/if-up.ndp-proxy | 2 ++ scripts/ifdown-connection | 2 ++ scripts/ifup | 2 ++ scripts/ifup-802.1q | 2 ++ scripts/ifup-autoip | 2 ++ scripts/ifup-bonding | 2 ++ scripts/ifup-bridge | 3 +++ scripts/ifup-dhcp | 2 ++ scripts/ifup-infiniband | 2 ++ scripts/ifup-ppp | 2 ++ scripts/ifup-route | 2 ++ scripts/ifup-services | 2 ++ scripts/ifup-skel | 2 ++ scripts/ifup-sysctl | 3 +++ scripts/ifup-tunnel | 2 ++ scripts/ifup-wireless | 2 ++ scripts/ip-up | 2 ++ scripts/netconfig | 1 + scripts/netconfig.d/dns-bind | 2 ++ scripts/netconfig.d/dns-dnsmasq | 2 ++ scripts/netconfig.d/dns-resolver | 2 ++ scripts/netconfig.d/nis | 2 ++ scripts/netconfig.d/ntp-runtime | 2 ++ scripts/network | 2 ++ scripts/network-remotefs | 2 ++ 29 files changed, 59 insertions(+), 0 deletions(-) diff --git a/scripts/convert_to_netconfig_dns b/scripts/convert_to_netconfig_dns index 04a7260..7cc6e84 100644 --- a/scripts/convert_to_netconfig_dns +++ b/scripts/convert_to_netconfig_dns @@ -5,6 +5,8 @@ # - 1 on failure ### +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + test "${DEBUG}" = yes && set -x # helper functions diff --git a/scripts/convert_to_netconfig_nis b/scripts/convert_to_netconfig_nis index 5c46eb5..f7e7571 100644 --- a/scripts/convert_to_netconfig_nis +++ b/scripts/convert_to_netconfig_nis @@ -5,6 +5,8 @@ # - 1 on failure ### +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + test "${DEBUG}" = yes && set -x # helper functions diff --git a/scripts/functions.rpm-utils b/scripts/functions.rpm-utils index 7b41018..7742a1e 100644 --- a/scripts/functions.rpm-utils +++ b/scripts/functions.rpm-utils @@ -1,5 +1,7 @@ #!/bin/bash +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + # similar to remove_and_set rpm suse macro, # but more flexible and able to handle files # in subdirs of the etc/sysconfig directory. diff --git a/scripts/if-up.ndp-proxy b/scripts/if-up.ndp-proxy index 3cd81f9..279f8c0 100755 --- a/scripts/if-up.ndp-proxy +++ b/scripts/if-up.ndp-proxy @@ -55,6 +55,8 @@ # 192.168.100.12 tap2 eth0 tap1 #-- +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "usage: $0 [<config>] <interface> [-o <options>]" diff --git a/scripts/ifdown-connection b/scripts/ifdown-connection index b1c8e68..4a9a38b 100644 --- a/scripts/ifdown-connection +++ b/scripts/ifdown-connection @@ -18,6 +18,8 @@ # $Id$ # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + # TODO: # when closing first use -TERM (except if we just try with -0) # for ichecking improve output and remove output from getdests() and nfscheck() diff --git a/scripts/ifup b/scripts/ifup index 789b356..95da1b0 100755 --- a/scripts/ifup +++ b/scripts/ifup @@ -29,6 +29,8 @@ # $Id$ # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "Usage: if{up,down,status} [<config>] <interface> [-o <options>]" diff --git a/scripts/ifup-802.1q b/scripts/ifup-802.1q index 66c84ba..bd6c1cf 100644 --- a/scripts/ifup-802.1q +++ b/scripts/ifup-802.1q @@ -7,6 +7,8 @@ # Marius Tomaschewski <[email protected]>, 2007-2009 # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "Usage: if{up,down}-802.1q [<config>] <interface> [-o <options>]" diff --git a/scripts/ifup-autoip b/scripts/ifup-autoip index ecb2e38..b515364 100755 --- a/scripts/ifup-autoip +++ b/scripts/ifup-autoip @@ -18,6 +18,8 @@ # Author: Michael Schroeder <[email protected]>, 2004 # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "Usage: if{up,down,status}-autoip [<config>] <interface> [-o <options>]" diff --git a/scripts/ifup-bonding b/scripts/ifup-bonding index 0d08965..b352687 100755 --- a/scripts/ifup-bonding +++ b/scripts/ifup-bonding @@ -23,6 +23,8 @@ # $Id$ # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "Usage: if{up,down,status}-bonding [<config>] <interface> [-o <options>]" diff --git a/scripts/ifup-bridge b/scripts/ifup-bridge index 041c760..e2e7c8f 100755 --- a/scripts/ifup-bridge +++ b/scripts/ifup-bridge @@ -12,6 +12,9 @@ # # $Id$ # + +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "usage: if{up,down,status}-bridge [<config>] <interface> [-o <options>]" diff --git a/scripts/ifup-dhcp b/scripts/ifup-dhcp index e42e615..368f4d2 100755 --- a/scripts/ifup-dhcp +++ b/scripts/ifup-dhcp @@ -19,6 +19,8 @@ # Peter Poeml <[email protected]>, 2002-2006 # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "Usage: if{up,down,status}-dhcp [<config>] <interface> [-o <options>]" diff --git a/scripts/ifup-infiniband b/scripts/ifup-infiniband index 2e24aac..4476ff5 100755 --- a/scripts/ifup-infiniband +++ b/scripts/ifup-infiniband @@ -23,6 +23,8 @@ # $Id$ # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "Usage: if{up,down,status}-infiniband [<config>] <interface> [-o <options>]" diff --git a/scripts/ifup-ppp b/scripts/ifup-ppp index 54250a1..2b9cd60 100755 --- a/scripts/ifup-ppp +++ b/scripts/ifup-ppp @@ -23,6 +23,8 @@ # $Id$ # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + function usage() { echo $@ diff --git a/scripts/ifup-route b/scripts/ifup-route index 48dabfa..7a9de82 100755 --- a/scripts/ifup-route +++ b/scripts/ifup-route @@ -21,6 +21,8 @@ # $Id$ # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "Usage: if{up,down,status}-route [<config>] <interface> [-o <options>]" diff --git a/scripts/ifup-services b/scripts/ifup-services index 8a3b083..8f06f6c 100755 --- a/scripts/ifup-services +++ b/scripts/ifup-services @@ -22,6 +22,8 @@ # $Id$ # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "Usage: if{up,down,status}-services [<config>] <interface> [-o <options>]" diff --git a/scripts/ifup-skel b/scripts/ifup-skel index dc04ab0..f4743eb 100755 --- a/scripts/ifup-skel +++ b/scripts/ifup-skel @@ -25,6 +25,8 @@ # $Id$ # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "" diff --git a/scripts/ifup-sysctl b/scripts/ifup-sysctl index 5b30dd5..5550241 100755 --- a/scripts/ifup-sysctl +++ b/scripts/ifup-sysctl @@ -20,6 +20,9 @@ # Author: # Marius Tomaschewski <[email protected]> # + +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "usage: if{up,down,status}-sysctl [<config>] <interface> [-o <options>]" diff --git a/scripts/ifup-tunnel b/scripts/ifup-tunnel index 60313da..5abd287 100755 --- a/scripts/ifup-tunnel +++ b/scripts/ifup-tunnel @@ -25,6 +25,8 @@ # $Id$ # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "Usage: if{up,down,status}-tunnel [<config>] <interface> [-o <options>]" diff --git a/scripts/ifup-wireless b/scripts/ifup-wireless index eb0ba7b..a75e8f2 100755 --- a/scripts/ifup-wireless +++ b/scripts/ifup-wireless @@ -22,6 +22,8 @@ # $Id$ # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + usage () { echo $@ echo "Usage: if{up,down,status}-wireless [<config>] <interface> [-o <options>]" diff --git a/scripts/ip-up b/scripts/ip-up index c7d02ab..b09430e 100755 --- a/scripts/ip-up +++ b/scripts/ip-up @@ -9,6 +9,8 @@ # Ludwig Nussel 26.02.2004 # Send suggestions and comments to http://www.suse.de/feedback/ +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + BASENAME=${0##*/} INTERFACE=$1 DEVICE=$2 diff --git a/scripts/netconfig b/scripts/netconfig index ac6ddad..74cce29 100755 --- a/scripts/netconfig +++ b/scripts/netconfig @@ -28,6 +28,7 @@ # because it was changed since the last run # +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features # The environment variable ROOT indicates the root of the system to be # managed by SuSEconfig when that root is not '/' diff --git a/scripts/netconfig.d/dns-bind b/scripts/netconfig.d/dns-bind index 1ea8e86..81f551b 100755 --- a/scripts/netconfig.d/dns-bind +++ b/scripts/netconfig.d/dns-bind @@ -21,6 +21,8 @@ # ## +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + if test "$UID" != "0" -a "$USER" != root -a -z "$ROOT" ; then echo "You must be root to start $0." >&2 exit 1 diff --git a/scripts/netconfig.d/dns-dnsmasq b/scripts/netconfig.d/dns-dnsmasq index 1bfb24d..6040016 100755 --- a/scripts/netconfig.d/dns-dnsmasq +++ b/scripts/netconfig.d/dns-dnsmasq @@ -21,6 +21,8 @@ # ## +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + if test "$UID" != "0" -a "$USER" != root -a -z "$ROOT" ; then echo "You must be root to start $0." >&2 exit 1 diff --git a/scripts/netconfig.d/dns-resolver b/scripts/netconfig.d/dns-resolver index b389084..d6e1106 100755 --- a/scripts/netconfig.d/dns-resolver +++ b/scripts/netconfig.d/dns-resolver @@ -20,6 +20,8 @@ # ## +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + if test "$UID" != "0" -a "$USER" != root -a -z "$ROOT" ; then echo "You must be root to start $0." >&2 exit 1 diff --git a/scripts/netconfig.d/nis b/scripts/netconfig.d/nis index e7c379d..a6a66ed 100755 --- a/scripts/netconfig.d/nis +++ b/scripts/netconfig.d/nis @@ -20,6 +20,8 @@ # ## +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + if test "$UID" != "0" -a "$USER" != root -a -z "$ROOT" ; then echo "You must be root to start $0." >&2 exit 1 diff --git a/scripts/netconfig.d/ntp-runtime b/scripts/netconfig.d/ntp-runtime index 162ad1a..86340e8 100755 --- a/scripts/netconfig.d/ntp-runtime +++ b/scripts/netconfig.d/ntp-runtime @@ -20,6 +20,8 @@ # ## +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + if test "$UID" != "0" -a "$USER" != root -a -z "$ROOT" ; then echo "You must be root to start $0." >&2 exit 1 diff --git a/scripts/network b/scripts/network index 05edcca..77c3b3b 100755 --- a/scripts/network +++ b/scripts/network @@ -42,6 +42,8 @@ # X-Systemd-RemainAfterExit: true ### END INIT INFO +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + . /etc/rc.status rc_reset diff --git a/scripts/network-remotefs b/scripts/network-remotefs index 11eb040..8383492 100755 --- a/scripts/network-remotefs +++ b/scripts/network-remotefs @@ -39,6 +39,8 @@ # X-Systemd-RemainAfterExit: true ### END INIT INFO +unset POSIXLY_CORRECT ; set +o posix # we're using non-posix bash features + . /etc/rc.status rc_reset -- 1.7.7 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
