24352188 zebra config file hardcoded in smf service check s11u3-sru
authorBrian Utterback <brian.utterback@oracle.com>
Fri, 03 Mar 2017 10:53:18 -0800
branchs11u3-sru
changeset 7928 c0e29588791b
parent 7927 9a07678a4c7f
child 7929 27eab5dcdc0b
24352188 zebra config file hardcoded in smf service check
components/quagga/patches/91-checkconffile.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/quagga/patches/91-checkconffile.patch	Fri Mar 03 10:53:18 2017 -0800
@@ -0,0 +1,30 @@
+This has been reported to the Quagga community as quagga bug
+879 https://bugzilla.quagga.net/show_bug.cgi?id=879
+This patch can be removed after upgrading to a version of Quagga 
+with bug 879 fixed.
+
+*** solaris/quagga.init.in
+--- solaris/quagga.init.in
+*************** esac
+*** 149,156 ****
+  DAEMON_ARGS=`routeadm_daemon_args $DAEMON`;
+  routeadm_zebra_enable $DAEMON;
+  
+! if [ ! -f "@[email protected]/${DAEMON}.conf" ] ; then
+! 	echo "Could not find config file, @[email protected]/${DAEMON}.conf"
+  	exit $SMF_EXIT_ERR_CONFIG
+  fi
+  
+--- 149,160 ----
+  DAEMON_ARGS=`routeadm_daemon_args $DAEMON`;
+  routeadm_zebra_enable $DAEMON;
+  
+! CONF_FILE=`get_routeadm_property $SMF_FMRI config_file`
+! if [ -z "$CONF_FILE" ] ; then
+! 	CONF_FILE="@[email protected]/${DAEMON}.conf"
+! fi
+! if [ ! -f "$CONF_FILE" ] ; then
+! 	echo "Could not find config file, $CONF_FILE"
+  	exit $SMF_EXIT_ERR_CONFIG
+  fi
+