fix init scriptsHEADmaster

svn path=/; revision=97

2 files changed, 22 insertions, 26 deletions

diff --git a/app-admin/dellomsa/files/conf_d_dellomsa b/app-admin/dellomsa/files/conf_d_dellomsa
index 5fc65dc..2802b2e 100644
--- a/app-admin/dellomsa/files/conf_d_dellomsa
+++ b/app-admin/dellomsa/files/conf_d_dellomsa
@@ -2,5 +2,7 @@
 # Configuration for Dell OpenManage
 #
 
-DEV_IPMI="yes"
-IPMI_SI="yes"
+
+# Enable Dell OpenManage Web Server Components that opens
+# port 1311 for https logins.
+ENABLE_WEB_MANAGEMENT="yes"
diff --git a/app-admin/dellomsa/files/init_d_dellomsa b/app-admin/dellomsa/files/init_d_dellomsa
index e5f048c..28a2759 100755
--- a/app-admin/dellomsa/files/init_d_dellomsa
+++ b/app-admin/dellomsa/files/init_d_dellomsa
@@ -6,73 +6,67 @@
 opts="reload"
 
 depend() {
-	use logger dns
-	need net
+   use logger dns
 }
 
 DSM_ROOT="/opt/dell/srvadmin"
 DSM_SA_DATAMGR="${DSM_ROOT}/dataeng/bin/dsm_sa_datamgr32d"
 DSM_SA_EVENTMGR="${DSM_ROOT}/dataeng/bin/dsm_sa_eventmgr32d"
 DSM_OM_SERVER="${DSM_ROOT}/oma/bin/dsm_om_shrsvc32d"
-DSM_OM_CONN_SERVER=${DSM_ROOT}/iws/bin/linux/dsm_om_connsvc32d"
+DSM_OM_CONN_SERVER="${DSM_ROOT}/iws/bin/linux/dsm_om_connsvc32d"
 
 DSM_SA_DATAMGR_PID="/var/run/dsm_sa_datamgr.pid"
 DSM_SA_EVENTMGR_PID="/var/run/dsm_sa_eventmgr.pid"
-DSM_OM_SERVER="/var/run/dsm_om_shrsvc.pid"
-DSM_OM_CONN_SERVER="/var/run/dsm_om_connsvr.pid"
+DSM_OM_SERVER_PID="/var/run/dsm_om_shrsvc.pid"
+DSM_OM_CONN_SERVER_PID="/var/run/dsm_om_connsvr.pid"
 
 OVERRIDE_LD_LIBRARY_PATH=/opt/dell/srvadmin/jre/lib/i386/client
 
-checkconfig() {
-	gen_keys || return 1
-
-	"${SSHD_BINARY}" -t ${myopts} || return 1
-}
-
 start() {
 	ebegin "Starting Dell Data Manager"
-	start-stop-daemon --start --exec "${DSM_SA_DATAMGR}"
+	start-stop-daemon --start --exec "${DSM_SA_DATAMGR}" \
 	    --pidfile "${DSM_SA_DATAMGR_PID}" 
 	eend $?
 
 	ebegin "Starting Dell Event Manager"
-	start-stop-daemon --start --exec "${DSM_SA_EVENTMGR}"
+	start-stop-daemon --start --exec "${DSM_SA_EVENTMGR}" \
 	    --pidfile "${DSM_SA_EVENTMGR_PID}" 
 	eend $?
 
 	ebegin "Starting Dell OpenManage Server"
-	start-stop-daemon --start --exec "${DSM_OM_SERVER}"
+	start-stop-daemon --start --exec "${DSM_OM_SERVER}" \
 	    --pidfile "${DSM_OM_SERVER_PID}" 
 	eend $?
 
-	ebegin "Starting Dell OpenManage Connection Server"
-    LD_LIBRARY_PATH=${OVERRIDE_LD_LIBRARY_PATH} \
-    	start-stop-daemon --start --exec "${DSM_OM_CONN_SERVER}"
-        	    --pidfile "${DSM_OM_CONN_SERVER_PID}" -- -run
-	eend $?
+    if [ "x${ENABLE_WEB_MANAGEMENT}" = "xyes" ]; then
+    	ebegin "Starting Dell OpenManage Connection Server"
+    	LD_LIBRARY_PATH=${OVERRIDE_LD_LIBRARY_PATH} \
+            	start-stop-daemon --start --exec "${DSM_OM_CONN_SERVER}" \
+                       	    --pidfile "${DSM_OM_CONN_SERVER_PID}" -- -run
+       	eend $?
+    fi
 }
 
 stop() {
 
 	ebegin "Stopping Dell OpenManage Connection Server"
-	start-stop-daemon --stop --exec "${DSM_OM_CONN_SERVER}"
+	start-stop-daemon --stop --exec "${DSM_OM_CONN_SERVER}" \
 	    --pidfile "${DSM_OM_CONN_SERVER_PID}" 
 	eend $?
 
 	ebegin "Stopping Dell OpenManage Server"
-	start-stop-daemon --stop --exec "${DSM_OM_SERVER}"
+	start-stop-daemon --stop --exec "${DSM_OM_SERVER}" \
 	    --pidfile "${DSM_OM_SERVER_PID}" 
 	eend $?
 
 	ebegin "Stopping Dell Event Manager"
-	start-stop-daemon --stop --exec "${DSM_SA_EVENTMGR}"
+	start-stop-daemon --stop --exec "${DSM_SA_EVENTMGR}" \
 	    --pidfile "${DSM_SA_EVENTMGR_PID}" 
 	eend $?
 
 	ebegin "Stopping Dell Data Manager"
-	start-stop-daemon --stop --exec "${DSM_SA_DATAMGR}"
+	start-stop-daemon --stop --exec "${DSM_SA_DATAMGR}" \
 	    --pidfile "${DSM_SA_DATAMGR_PID}" 
 	eend $?
 
 }
-