File sysconfig_ifstatus_dont_use_syslog.261350.patch of Package sysconfig

File sysconfig_ifstatus_dont_use_syslog.261350.patch of Package sysconfig (Revision 1)

Currently displaying revision 1, show latest

--- doc/ifup.8	2006-01-17 13:46:52.000000000 +0000
+++ doc/ifup.8	2007-04-22 10:39:03.000000000 +0000
@@ -151,6 +151,15 @@
 interfaces.
 .IP debug
 Be verbose.
+.IP (no)syslog
+With
+.B nosyslog
+the scripts don't send messages to syslog even if the configuration
+variable
+.B USE_SYSLOG 
+is set to "yes". This is default for ifstatus only.
+If you want also ifstatus messages send to syslog then call it with
+.B syslog.
 .SH FILES
 .I /sbin/ifup
 .RS
--- scripts/functions.common	2006-02-14 19:18:29.000000000 +0000
+++ scripts/functions.common	2007-04-22 10:16:15.000000000 +0000
@@ -121,6 +121,10 @@
 test "$DEBUG" == yes && LOG_LEVEL=7
 SCRIPTNAME=${SCRIPTNAME:-${0##*/}}
 
+# DONT_USE_SYSLOG=yes will be set in ifstatus to overwrite USE_SYSLOG. This is
+# a workaround for bug 261350.
+test "$DONT_USE_SYSLOG" == yes && USE_SYSLOG=no
+
 if [ "$USE_SYSLOG" != yes ] ; then
 	mesg() {
 		echo -e "$@" # >&2
--- scripts/ifup	2007-04-22 10:13:53.000000000 +0000
+++ scripts/ifup	2007-04-22 10:40:39.000000000 +0000
@@ -44,9 +44,13 @@
 	echo "    prov=<n> : use provider <n> (for dial up interface)"
 	echo "    nodeps   : don't shut down interfaces depending on this" 
 	echo "    debug    : be verbose"
-	test "$SCRIPTNAME" = "ifstatus" &&
+	if [ "$SCRIPTNAME" = "ifstatus" ] ; then
+		echo "    syslog   : write to syslog if USE_SYSLOG=yes"
 		echo -e "    check    : return R_BUSY (=$R_BUSY) if there are" \
 		      "\n               active connections on this interface"
+	else
+		echo "    nosyslog : don't write to syslog even if USE_SYSLOG=yes"
+	fi
 	echo "If options are contradictionary, last option wins. Unknown options"
 	echo "are simply ignored, so be careful."
 	echo
@@ -94,6 +98,10 @@
 MODE=manual
 HOTPLUG=no
 CONTROL_IFPLUGD=yes # Start/Stop ifplugd?
+# Don't log messages from ifstatus in syslog by default (Bug 261350). This
+# overwrites the config variable /etc/sysconfig/network/config:USE_SYSLOG
+export DONT_USE_SYSLOG=no
+test "$SCRIPTNAME" == ifstatus && DONT_USE_SYSLOG=yes
 while [ $# -gt 0 ]; do
 	case $1 in
 		boot|onboot) MODE=auto ;;
@@ -107,6 +115,8 @@
 		check)       CHECK=yes ;;
 		quiet)       be_quiet_has_gone ;;
 		debug)       DEBUG=yes ;;
+		nosyslog)    DONT_USE_SYSLOG=yes ;;
+		syslog)      DONT_USE_SYSLOG=no ;;
 		prov=*)      PROVIDER=${1##*=} ;;
 		dhcp)        DHCP=yes; CONTROL_IFPLUGD=no ;;
 		nodeps)      NODEPS=yes ;;