fix init scriptsHEADmaster

svn path=/; revision=97

3 files changed, 30 insertions, 34 deletions

diff --git a/app-admin/dellomsa/Manifest b/app-admin/dellomsa/Manifest
index 7170446..763ec0a 100644
--- a/app-admin/dellomsa/Manifest
+++ b/app-admin/dellomsa/Manifest
@@ -1,15 +1,15 @@
-AUX conf_d_dellomsa 70 RMD160 2f2b4e2d577f9677cc46683c00002f2d89309eea SHA1 da9a683b5e8289a8e2c654bbe8c980fea1821909 SHA256 5f8e739b0a740036f068c706941c62f12fbb93d2e7208ae6d499ea58e64ce749
-MD5 f2484b6995e49df0d1e5742e61a29189 files/conf_d_dellomsa 70
-RMD160 2f2b4e2d577f9677cc46683c00002f2d89309eea files/conf_d_dellomsa 70
-SHA256 5f8e739b0a740036f068c706941c62f12fbb93d2e7208ae6d499ea58e64ce749 files/conf_d_dellomsa 70
+AUX conf_d_dellomsa 158 RMD160 6032cfeba9573dcda91d9d4be368c40bca87ac97 SHA1 aba5ea4a3353aadbdaae0c87af6df13d9fb75971 SHA256 2ec5e6002986db3c5afaf233c5eb1d963f9bbcc11b227f50b4ba09cf5144a6aa
+MD5 e375521884e3ced5e9250b01f7761429 files/conf_d_dellomsa 158
+RMD160 6032cfeba9573dcda91d9d4be368c40bca87ac97 files/conf_d_dellomsa 158
+SHA256 2ec5e6002986db3c5afaf233c5eb1d963f9bbcc11b227f50b4ba09cf5144a6aa files/conf_d_dellomsa 158
 AUX env_d_dellomsa 599 RMD160 6b79e39320dd20983d2976f25363839f41687675 SHA1 668288c4f9e89a43aa734ddfb0c533058f8effcb SHA256 2786345ae214a5df905dae610667ce36fa6d491f47ddfea920586b28d5f19bed
 MD5 4fc3f9a4daabd30ffe4793dbbdc26a16 files/env_d_dellomsa 599
 RMD160 6b79e39320dd20983d2976f25363839f41687675 files/env_d_dellomsa 599
 SHA256 2786345ae214a5df905dae610667ce36fa6d491f47ddfea920586b28d5f19bed files/env_d_dellomsa 599
-AUX init_d_dellomsa 2179 RMD160 533da085955aa41f5c7fc918c831cc6f5adf1e02 SHA1 f7d50779cd31f155fd2a3f2396fea152ee353ac4 SHA256 7cac4998ff986450156c008415132aeff47c51558eac4bdb7d5f35b586adaf76
-MD5 c08acb0891c922c3591cc85911aac1d4 files/init_d_dellomsa 2179
-RMD160 533da085955aa41f5c7fc918c831cc6f5adf1e02 files/init_d_dellomsa 2179
-SHA256 7cac4998ff986450156c008415132aeff47c51558eac4bdb7d5f35b586adaf76 files/init_d_dellomsa 2179
+AUX init_d_dellomsa 2206 RMD160 3a15de89221393a7356a64289e007fd934ab33e2 SHA1 f90bdc438875f44b1dbe94ea4fe5b5e1f7a37758 SHA256 a396ab162318dd518536cc601aed27bf57bfe4fa5ec960704c59a486ae43769b
+MD5 fb480b1391d8ab4a71525089e30bb774 files/init_d_dellomsa 2206
+RMD160 3a15de89221393a7356a64289e007fd934ab33e2 files/init_d_dellomsa 2206
+SHA256 a396ab162318dd518536cc601aed27bf57bfe4fa5ec960704c59a486ae43769b files/init_d_dellomsa 2206
 AUX omreg.cfg 6258 RMD160 1b5710bfc9690b212e83918929f083168118a49d SHA1 7103cc353c7053b2edef7c938f203f9caf352792 SHA256 16fce5a7883ad6d84d64196a01f1292777af14dfdfdd42b2bdc0dd7a4ddf6fac
 MD5 d9390e1287704dd59968a3b18ba1f31f files/omreg.cfg 6258
 RMD160 1b5710bfc9690b212e83918929f083168118a49d files/omreg.cfg 6258
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 $?
 
 }
-