Hello community,
here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2014-06-01 18:54:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sysconfig (Old)
and /work/SRC/openSUSE:Factory/.sysconfig.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2014-03-18 13:38:27.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2014-06-01 18:54:50.000000000 +0200
@@ -1,0 +2,21 @@
+Wed May 28 10:29:03 UTC 2014 - mt@suse.de
+
+- version 0.83.6
+- netconfig: fixed manual page to not refer README (bnc#876755)
+
+-------------------------------------------------------------------
+Wed May 28 07:17:30 UTC 2014 - mt@suse.de
+
+- version 0.83.5
+- sysconfig/network/config: new default to send gratuitous arp
+ Enabled to send gratuitous arp by default, when duplicate IPv4
+ check is enabled and were successful (bnc#879911,fate#314399).
+- netconfig: improved troubleshooting capabilities
+ Added NETCONFIG_VERBOSE and NETCONFIG_FORCE_REPLACE config
+ variables allowing to run all netconfig calls in debug mode
+ and force update of modified files as default. Show service,
+ policy resolving info and log the commandline in debug mode.
+ Fixed to log info/warnings that were printed to stderr only
+ before (bnc#860644, bnc#868323).
+
+-------------------------------------------------------------------
Old:
----
sysconfig-0.83.4.tar.bz2
New:
----
sysconfig-0.83.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sysconfig.spec ++++++
--- /var/tmp/diff_new_pack.75hby8/_old 2014-06-01 18:54:51.000000000 +0200
+++ /var/tmp/diff_new_pack.75hby8/_new 2014-06-01 18:54:51.000000000 +0200
@@ -17,7 +17,7 @@
Name: sysconfig
-Version: 0.83.4
+Version: 0.83.6
Release: 0
Summary: The sysconfig scheme for traditional network scripts
License: GPL-2.0+
++++++ sysconfig-0.83.4.tar.bz2 -> sysconfig-0.83.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/ChangeLog new/sysconfig-0.83.6/ChangeLog
--- old/sysconfig-0.83.4/ChangeLog 2014-03-12 18:41:11.000000000 +0100
+++ new/sysconfig-0.83.6/ChangeLog 2014-05-28 12:32:46.000000000 +0200
@@ -1,4 +1,44 @@
-commit 33bb956a2effdc88eeeaf1939205217da6caea4b (HEAD, master)
+commit 381b54d18b1f26cf493a76a4b38799266bd9a069 (HEAD, tag: version-0.83.6, origin/master, master)
+Author: Marius Tomaschewski
+Date: Wed May 28 12:30:10 2014 +0200
+
+ version 0.83.6, updated changes
+
+commit a03e90c0d0823d8b14a2b7c1405a2310c5f7420b
+Author: Marius Tomaschewski
+Date: Wed May 28 12:27:21 2014 +0200
+
+ netconfig: fixed manual page to not refer README (bnc#876755)
+
+commit 56eb432d4e0e09e9189897c22ee7465d0983414d (tag: version-0.83.5)
+Author: Marius Tomaschewski
+Date: Wed May 28 09:21:05 2014 +0200
+
+ version 0.83.5, updated changes
+
+commit 65f50206a6a03e4a04beac2db04b27bad6c2c671
+Author: Marius Tomaschewski
+Date: Wed May 28 09:09:41 2014 +0200
+
+ config: new default to send gratuitous arp
+
+ Changed to send gratuitous arp by default, when duplicate IPv4
+ check is enabled and were successful (bnc#879911,fate#314399).
+
+commit ab37fb0b77603c4ecf6f501c24f4a8be2425e0f2 (master-netconfig)
+Author: Marius Tomaschewski
+Date: Wed Mar 19 13:44:05 2014 +0100
+
+ netconfig: improved troubleshooting capabilities
+
+ Added NETCONFIG_VERBOSE and NETCONFIG_FORCE_REPLACE config
+ variables allowing to run all netconfig calls in debug mode
+ and force update of modified files as default. Show service,
+ policy resolving info and log the commandline in debug mode.
+ Fixed to log info/warnings that were printed to stderr only
+ before (bnc#860644, bnc#868323).
+
+commit 33bb956a2effdc88eeeaf1939205217da6caea4b (tag: version-0.83.4, origin/sle12-sp0, sle12-sp0)
Author: Marius Tomaschewski
Date: Wed Mar 12 18:40:29 2014 +0100
@@ -10,7 +50,7 @@
config: check ipv4 duplicates by default (fate#314399)
-commit 68d80bb35505838e89332452bb1636dcdaf166fe (tag: version-0.83.3, origin/sle12-sp0, origin/master, sle12-sp0)
+commit 68d80bb35505838e89332452bb1636dcdaf166fe (tag: version-0.83.3)
Author: Marius Tomaschewski
Date: Fri Feb 21 09:25:54 2014 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/Makefile.in new/sysconfig-0.83.6/Makefile.in
--- old/sysconfig-0.83.4/Makefile.in 2014-03-12 18:41:04.000000000 +0100
+++ new/sysconfig-0.83.6/Makefile.in 2014-05-28 12:32:39.000000000 +0200
@@ -80,8 +80,8 @@
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/sysconfig.spec.in config.guess config.sub install-sh \
- missing ltmain.sh
+ $(srcdir)/sysconfig.spec.in config.guess config.sub depcomp \
+ install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/VERSION new/sysconfig-0.83.6/VERSION
--- old/sysconfig-0.83.4/VERSION 2014-03-12 18:40:17.000000000 +0100
+++ new/sysconfig-0.83.6/VERSION 2014-05-28 12:28:52.000000000 +0200
@@ -1 +1 @@
-0.83.4
+0.83.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/config/sysconfig.config-network new/sysconfig-0.83.6/config/sysconfig.config-network
--- old/sysconfig-0.83.4/config/sysconfig.config-network 2014-03-12 18:35:40.000000000 +0100
+++ new/sysconfig-0.83.6/config/sysconfig.config-network 2014-05-28 08:10:54.000000000 +0200
@@ -21,20 +21,23 @@
## Type: yesno
## Default: yes
-# If ifup should check if an ip address is already in use, set this to yes.
+# If ifup should check if an IPv4 address is already in use, set this to yes.
+#
# Make sure that packet sockets (CONFIG_PACKET) are supported in the kernel,
-# since this feature uses arping, which depends on that.
+# since this feature uses arp, which depends on that.
# Also be aware that this takes one second per interface; consider that when
# setting up a lot of interfaces.
CHECK_DUPLICATE_IP="yes"
-## Type: yesno
-## Default: no
+## Type: list(auto,yes,no)
+## Default: auto
# If ifup should send a gratuitous ARP to inform the receivers about its
-# static IP addresses and perhaps also a link-layer (MAC) address change.
+# IPv4 addresses. Default is to send gratuitous ARP, when duplicate IPv4
+# address check is enabled and the check were sucessful.
+#
# Make sure that packet sockets (CONFIG_PACKET) are supported in the kernel,
-# since this feature uses arping, which depends on that.
-SEND_GRATUITOUS_ARP="no"
+# since this feature uses arp, which depends on that.
+SEND_GRATUITOUS_ARP="auto"
## Type: yesno
## Default: no
@@ -169,6 +172,29 @@
#
NETCONFIG_MODULES_ORDER="dns-resolver dns-bind dns-dnsmasq nis ntp-runtime"
+## Type: yesno
+## Default: no
+#
+# Enable netconfig verbose reporting.
+#
+NETCONFIG_VERBOSE="no"
+
+## Type: yesno
+## Default: no
+#
+# This variable enables netconfig to always force a replace of modified
+# files and automatically enables the -f | --force-replace parameter.
+#
+# The purpose is to use it as workaround, when some other tool trashes
+# the files, e.g. /etc/resolv.conf and you observe messages like this
+# in your logs on in "netconfig update" output:
+# ATTENTION: You have modified /etc/resolv.conf. Leaving it untouched.
+#
+# Please do not forget to also report a bug as we have a system policy
+# to use netconfig.
+#
+NETCONFIG_FORCE_REPLACE="no"
+
## Type: string
## Default: "auto"
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/configure new/sysconfig-0.83.6/configure
--- old/sysconfig-0.83.4/configure 2014-03-12 18:41:04.000000000 +0100
+++ new/sysconfig-0.83.6/configure 2014-05-28 12:32:39.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.69 for sysconfig 0.83.4.
+# Generated by GNU Autoconf 2.69 for sysconfig 0.83.6.
#
# Report bugs to http://bugs.opensuse.org.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='sysconfig'
PACKAGE_TARNAME='sysconfig'
-PACKAGE_VERSION='0.83.4'
-PACKAGE_STRING='sysconfig 0.83.4'
+PACKAGE_VERSION='0.83.6'
+PACKAGE_STRING='sysconfig 0.83.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org'
PACKAGE_URL='https://github.com/openSUSE/sysconfig'
@@ -1329,7 +1329,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.83.4 to adapt to many kinds of systems.
+\`configure' configures sysconfig 0.83.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1399,7 +1399,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sysconfig 0.83.4:";;
+ short | recursive ) echo "Configuration of sysconfig 0.83.6:";;
esac
cat <<\_ACEOF
@@ -1508,7 +1508,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sysconfig configure 0.83.4
+sysconfig configure 0.83.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1877,7 +1877,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.83.4, which was
+It was created by sysconfig $as_me 0.83.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2744,7 +2744,7 @@
# Define the identity of the package.
PACKAGE='sysconfig'
- VERSION='0.83.4'
+ VERSION='0.83.6'
cat >>confdefs.h <<_ACEOF
@@ -12244,7 +12244,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.83.4, which was
+This file was extended by sysconfig $as_me 0.83.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12302,7 +12302,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-sysconfig config.status 0.83.4
+sysconfig config.status 0.83.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/doc/netconfig.8 new/sysconfig-0.83.6/doc/netconfig.8
--- old/sysconfig-0.83.4/doc/netconfig.8 2014-01-09 13:55:16.000000000 +0100
+++ new/sysconfig-0.83.6/doc/netconfig.8 2014-05-28 12:27:06.000000000 +0200
@@ -411,7 +411,5 @@
.SH "SEE ALSO"
.BR ifcfg (5),
.br
-.BR /etc/sysconfig/network/config ,
-.br
-.BR /usr/share/doc/packages/sysconfig/README.netconfig .
+.BR /etc/sysconfig/network/config .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/scripts/functions.netconfig new/sysconfig-0.83.6/scripts/functions.netconfig
--- old/sysconfig-0.83.4/scripts/functions.netconfig 2014-01-09 13:55:16.000000000 +0100
+++ new/sysconfig-0.83.6/scripts/functions.netconfig 2014-05-28 08:00:28.000000000 +0200
@@ -29,36 +29,59 @@
}
debug () {
+ test "$QUIET" = "yes" && return
test "$VERBOSE" = "yes" || return
echo -e "debug: $*" >&2
}
warn () {
test "$QUIET" = "yes" && return
- echo -e "$*" >&2
+ logger -s -p warn -t "$PROGNAME" "$*"
}
log () {
- logger -t "$PROGNAME" "$*"
- debug "$*"
- if [ "$ACTION" = "cleanup" -a "$QUIET" != "yes" ] ; then
- echo -e "$*" >&2
- fi
+ test "$QUIET" = "yes" && return
+ logger -s -t "$PROGNAME" "$*"
+}
+
+find_current_service()
+{
+ local name=$1
+ local pfx file link
+ for pfx in /etc/systemd /var/run/systemd /run/systemd ; do
+ file="$pfx/system/$name"
+ test -f "$file" || continue
+ link=`readlink -f "$file" 2>/dev/null`
+ test "X$link" = "X" -o "X$link" = "X$name" && continue
+ echo "${link##*/}"
+ return 0
+ done
+ echo "$name"
+ return 1
}
netconfig_policy()
{
local policy="$1"
+ local hint="${2:+$2-}"
local Id=`systemctl --no-pager -p Id show network.service 2>/dev/null`
+ local service=${Id#Id=}
+
+ service=${service%.service}
+ if test "X$service" = "X" ; then
+ debug "Systemd did not reported any enabled network service"
+ service=`find_current_service "network.service" 2>/dev/null`
+ service=${service%.service}
+ debug "Using '$service' as network service"
+ fi
- case ${Id#Id=} in
- NetworkManager.service)
+ case ${service} in
+ NetworkManager)
#
# Use NetworkManager policy merged data
#
test "x$policy" = "xauto" && \
policy='STATIC_FALLBACK NetworkManager'
- echo "$policy"
;;
network.service|*)
#
@@ -67,9 +90,11 @@
#
test "x$policy" = "xauto" && \
policy='STATIC *'
- echo "$policy"
;;
esac
+ debug "Resolved ${hint}policy '$1' for service '${service}' to '$policy'"
+
+ echo "$policy"
}
function get_variable()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/scripts/netconfig new/sysconfig-0.83.6/scripts/netconfig
--- old/sysconfig-0.83.4/scripts/netconfig 2014-03-12 18:34:11.000000000 +0100
+++ new/sysconfig-0.83.6/scripts/netconfig 2014-05-28 08:00:28.000000000 +0200
@@ -52,7 +52,7 @@
fi
if test "x${LEASEFILE}" != x -a ! -r "${LEASEFILE}" ; then
- echo "Unable to read specified input file '${LEASEFILE}'" >&2
+ warn "Unable to read specified input file '${LEASEFILE}'"
exit 1
fi
@@ -77,7 +77,7 @@
(SERVICE|INTERFACE)
eval "_$key='$val'"
if test "x${!key}" != x -a "x${!key}" != "x$val" ; then
- echo "Input value $key conflicts with command line argument" >&1
+ warn "Input value $key conflicts with command line argument"
exit 1
fi
;;
@@ -89,11 +89,11 @@
VALS[${#VALS[@]}]=$val
done < <(netconfig_kv_filter ${LEASEFILE:+"$LEASEFILE"})
if test $err -ne 0 ; then
- echo "Invalid syntax in ${LEASEFILE:+${LEASEFILE}, }line $err" >&2
+ warn "Invalid syntax in ${LEASEFILE:+${LEASEFILE}, }line $err"
exit 1
fi
else
- echo "Unsupported lease file / input format '$INPUTFORMAT'" >&2
+ warn "Unsupported lease file / input format '$INPUTFORMAT'"
exit 1
fi
@@ -352,12 +352,17 @@
exit 1
}
-COMMANDLINE="$@"
+COMMANDLINE="$*"
ACTION=""
SERVICE=""
INTERFACE=""
VARIABLE=""
MODFILTER=""
+FORCE_REPLACE=false
+QUIET=no
+VERBOSE=no
+test "X$NETCONFIG_VERBOSE" = "Xyes" && VERBOSE="yes"
+test "X$NETCONFIG_FORCE_REPLACE" = "Xyes" && FORCE_REPLACE="true"
while true ; do
# Interface is checked against sysfs before the data is used;
# reject just the most the ugliest characters...
@@ -371,9 +376,10 @@
-l|--lease-file) VARIABLE=LEASEFILE;;
-I|--input-file) VARIABLE=LEASEFILE;;
-F|--input-format) VARIABLE=INPUTFORMAT;;
- -f|--force-replace) FORCE_REPLACE="true";;
- -v|--verbose) VERBOSE="yes";;
-m|--module-only) VARIABLE=MODFILTER;;
+ -f|--force-replace) FORCE_REPLACE="true";;
+ -v|--verbose) VERBOSE="yes"; QUIET="no";;
+ -q|--quiet) QUIET="yes"; VERBOSE="no";;
-h|--help) usage;;
"") break ;;
--)
@@ -409,21 +415,20 @@
test -z "$ACTION" && usage No action was given
-if [ "$VERBOSE" = "yes" ]; then
- export VERBOSE=$VERBOSE
-fi
+test "X$VERBOSE" = "Xyes" && log "Executing '$COMMANDLINE' for pid $PPID"
+export VERBOSE QUIET
#
# before we start, check for root
#
if test "$UID" != "0" -a "$USER" != root -a -z "$ROOT" ; then
- echo "You must be root to start $0." >&2
+ log "You must be root to start $0."
exit 1
fi
# Check if we can write in /tmp
if ! touch $r/tmp &>/dev/null; then
- echo "Filesystem read only: Cannot modify anything" >&2
+ log "Filesystem read only: Cannot modify anything"
exit 1
fi
@@ -432,7 +437,7 @@
# Create state directory
if ! mkdir -p "$STATEDIR" ; then
- echo "Unable to create netconfig state directory '$STATEDIR'" >&2
+ log "Unable to create netconfig state directory '$STATEDIR'"
exit 1
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/scripts/netconfig.d/dns-bind new/sysconfig-0.83.6/scripts/netconfig.d/dns-bind
--- old/sysconfig-0.83.4/scripts/netconfig.d/dns-bind 2014-03-12 18:34:11.000000000 +0100
+++ new/sysconfig-0.83.6/scripts/netconfig.d/dns-bind 2014-05-28 08:00:28.000000000 +0200
@@ -23,7 +23,7 @@
unset POSIXLY_CORRECT ; set +o posix # we are 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
+ warn "You must be root to start $0."
exit 1
fi
@@ -174,7 +174,7 @@
esac
# just for the case we need the original value...
-_NETCONFIG_DNS_POLICY=`netconfig_policy "$NETCONFIG_DNS_POLICY"`
+_NETCONFIG_DNS_POLICY=`netconfig_policy "$NETCONFIG_DNS_POLICY" dns`
if [ "x$_NETCONFIG_DNS_POLICY" = "x" ]; then
#
# empty policy means do not touch anything.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/scripts/netconfig.d/dns-dnsmasq new/sysconfig-0.83.6/scripts/netconfig.d/dns-dnsmasq
--- old/sysconfig-0.83.4/scripts/netconfig.d/dns-dnsmasq 2014-03-12 18:34:11.000000000 +0100
+++ new/sysconfig-0.83.6/scripts/netconfig.d/dns-dnsmasq 2014-05-28 08:00:28.000000000 +0200
@@ -23,7 +23,7 @@
unset POSIXLY_CORRECT ; set +o posix # we are 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
+ warn "You must be root to start $0."
exit 1
fi
@@ -176,7 +176,7 @@
esac
# just for the case we need the original value...
-_NETCONFIG_DNS_POLICY=`netconfig_policy "$NETCONFIG_DNS_POLICY"`
+_NETCONFIG_DNS_POLICY=`netconfig_policy "$NETCONFIG_DNS_POLICY" dns`
if [ "x$_NETCONFIG_DNS_POLICY" = "x" ]; then
#
# empty policy means do not touch anything.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/scripts/netconfig.d/dns-resolver new/sysconfig-0.83.6/scripts/netconfig.d/dns-resolver
--- old/sysconfig-0.83.4/scripts/netconfig.d/dns-resolver 2014-03-12 18:34:11.000000000 +0100
+++ new/sysconfig-0.83.6/scripts/netconfig.d/dns-resolver 2014-05-28 08:00:28.000000000 +0200
@@ -22,7 +22,7 @@
unset POSIXLY_CORRECT ; set +o posix # we are 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
+ warn "You must be root to start $0." >&2
exit 1
fi
@@ -226,7 +226,7 @@
esac
# just for the case we need the original value...
-_NETCONFIG_DNS_POLICY=`netconfig_policy "$NETCONFIG_DNS_POLICY"`
+_NETCONFIG_DNS_POLICY=`netconfig_policy "$NETCONFIG_DNS_POLICY" dns`
if [ "x$_NETCONFIG_DNS_POLICY" = "x" ]; then
#
# empty policy means do not touch anything.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/scripts/netconfig.d/nis new/sysconfig-0.83.6/scripts/netconfig.d/nis
--- old/sysconfig-0.83.4/scripts/netconfig.d/nis 2014-03-12 18:34:11.000000000 +0100
+++ new/sysconfig-0.83.6/scripts/netconfig.d/nis 2014-05-28 08:00:28.000000000 +0200
@@ -22,7 +22,7 @@
unset POSIXLY_CORRECT ; set +o posix # we are 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
+ warn "You must be root to start $0."
exit 1
fi
@@ -357,7 +357,7 @@
# just for the case we need the original value...
-_NETCONFIG_NIS_POLICY=`netconfig_policy "$NETCONFIG_NIS_POLICY"`
+_NETCONFIG_NIS_POLICY=`netconfig_policy "$NETCONFIG_NIS_POLICY" nis`
if [ "x$_NETCONFIG_NIS_POLICY" = "x" ]; then
#
# empty policy means do not touch anything.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/scripts/netconfig.d/ntp-runtime new/sysconfig-0.83.6/scripts/netconfig.d/ntp-runtime
--- old/sysconfig-0.83.4/scripts/netconfig.d/ntp-runtime 2014-03-12 18:34:11.000000000 +0100
+++ new/sysconfig-0.83.6/scripts/netconfig.d/ntp-runtime 2014-05-28 08:00:28.000000000 +0200
@@ -22,7 +22,7 @@
unset POSIXLY_CORRECT ; set +o posix # we are 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
+ warn "You must be root to start $0."
exit 1
fi
@@ -151,7 +151,7 @@
# *********************
# just for the case we need the original value...
-_NETCONFIG_NTP_POLICY=`netconfig_policy "$NETCONFIG_NTP_POLICY"`
+_NETCONFIG_NTP_POLICY=`netconfig_policy "$NETCONFIG_NTP_POLICY" ntp`
if [ "x$_NETCONFIG_NTP_POLICY" = "x" ]; then
#
# empty policy means do not touch anything.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.83.4/sysconfig.spec new/sysconfig-0.83.6/sysconfig.spec
--- old/sysconfig-0.83.4/sysconfig.spec 2014-03-12 18:41:06.000000000 +0100
+++ new/sysconfig-0.83.6/sysconfig.spec 2014-05-28 12:32:41.000000000 +0200
@@ -18,7 +18,7 @@
Name: sysconfig
-Version: 0.83.4
+Version: 0.83.6
Release: 0
Summary: The sysconfig scheme for traditional network scripts
License: GPL-2.0+
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org