Fix certain errors like symlinking and etc installing in ebuild

svn path=/; revision=96

3 files changed, 29 insertions, 12 deletions

diff --git a/app-admin/dellomsa/Manifest b/app-admin/dellomsa/Manifest
index 80a6b2d..7170446 100644
--- a/app-admin/dellomsa/Manifest
+++ b/app-admin/dellomsa/Manifest
@@ -6,10 +6,10 @@ AUX env_d_dellomsa 599 RMD160 6b79e39320dd20983d2976f25363839f41687675 SHA1 6682
 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 2052 RMD160 fe7a0ac3c933439ee3687f87a45dee2e3a97dfb8 SHA1 798dbb7385f40b9873177ffdc73308e47fe90165 SHA256 5e41bc0d82fcd40a43d8a96861d60ae2196597c4be36577689c99d96b497b126
-MD5 94e550b6582fab72848c6c9e3b693170 files/init_d_dellomsa 2052
-RMD160 fe7a0ac3c933439ee3687f87a45dee2e3a97dfb8 files/init_d_dellomsa 2052
-SHA256 5e41bc0d82fcd40a43d8a96861d60ae2196597c4be36577689c99d96b497b126 files/init_d_dellomsa 2052
+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 omreg.cfg 6258 RMD160 1b5710bfc9690b212e83918929f083168118a49d SHA1 7103cc353c7053b2edef7c938f203f9caf352792 SHA256 16fce5a7883ad6d84d64196a01f1292777af14dfdfdd42b2bdc0dd7a4ddf6fac
 MD5 d9390e1287704dd59968a3b18ba1f31f files/omreg.cfg 6258
 RMD160 1b5710bfc9690b212e83918929f083168118a49d files/omreg.cfg 6258
@@ -19,10 +19,10 @@ MD5 437b3dfd96b45ee37aab6a555c340043 files/pam_d_omauth 134
 RMD160 ca5a5b4cca87ac0b90c6cc81f373c85778641b0b files/pam_d_omauth 134
 SHA256 6e87b6ea612cfc8a48ae12734939e5f5788ecf62691438dc8a37eab63a77d3a0 files/pam_d_omauth 134
 DIST dellomsa_5.1.0-2_i386.deb 82878630 RMD160 08146ba8b8f32fc971388e3654de4886f4d2ca17 SHA1 481bda551c4bd14f50feeb5d2f23fc95d6513a5a SHA256 f71d5d7815b436b899d53d290044aa17fb9e90d388d8909b9a19f62c365d3cdc
-EBUILD dellomsa-5.1.0.ebuild 1053 RMD160 7dd423ea4464debe57098116eb9b9feed85b49f9 SHA1 92f29cecca9d83b22f4187d595a383179ffa3043 SHA256 510d242059e565dc4324ba0df082301c48b6af8ea66423a0e05259beb7389c57
-MD5 f8f0c7e1b9d1fdd29d1d529967717355 dellomsa-5.1.0.ebuild 1053
-RMD160 7dd423ea4464debe57098116eb9b9feed85b49f9 dellomsa-5.1.0.ebuild 1053
-SHA256 510d242059e565dc4324ba0df082301c48b6af8ea66423a0e05259beb7389c57 dellomsa-5.1.0.ebuild 1053
+EBUILD dellomsa-5.1.0.ebuild 1422 RMD160 41f736ebbc96c1107a1ae82edece6012d978296b SHA1 e37ee93d095004b5e65a1fc6cae0c05a858d19ca SHA256 fedf82731d1188844a63df882258cd6980d72a2f538579bdb9da30f85b86d9df
+MD5 9bd22b85cd58a9729c9d21112e72d2f7 dellomsa-5.1.0.ebuild 1422
+RMD160 41f736ebbc96c1107a1ae82edece6012d978296b dellomsa-5.1.0.ebuild 1422
+SHA256 fedf82731d1188844a63df882258cd6980d72a2f538579bdb9da30f85b86d9df dellomsa-5.1.0.ebuild 1422
 MD5 5bd8b5a0866b07ab7e7c236ddb9476ce files/digest-dellomsa-5.1.0 262
 RMD160 91e31745aaee06d46fd5b3725bc1151a2324c3bb files/digest-dellomsa-5.1.0 262
 SHA256 0e35cadba84e9a322f6bef82da10b2bbde3b2b80f92f13ae34f86fe02e68d96a files/digest-dellomsa-5.1.0 262
diff --git a/app-admin/dellomsa/dellomsa-5.1.0.ebuild b/app-admin/dellomsa/dellomsa-5.1.0.ebuild
index 1b47962..5c8793c 100644
--- a/app-admin/dellomsa/dellomsa-5.1.0.ebuild
+++ b/app-admin/dellomsa/dellomsa-5.1.0.ebuild
@@ -34,7 +34,11 @@ src_install() {
 	rsync -avr ${WORKDIR}/opt ${D}
 	
 	ln -s /opt/dell/srvadmin/ ${D}/etc/delloma.d
-	dodir /opt/dell/srvadmin/shared/.sharedipc
+	keepdir /opt/dell/srvadmin/shared/.sharedipc
+	keepdir /opt/dell/srvadmin/oma/log
+	keepdir /opt/dell/srvadmin/iws/{tmp,logs,config,contexts}
+	keepdir /opt/dell/srvadmin/hapi/.ipc
+
 	
 	newinitd ${FILESDIR}/init_d_dellomsa dellomsa
 	newconfd ${FILESDIR}/conf_d_dellomsa dellomsa
@@ -43,5 +47,15 @@ src_install() {
 	insinto /etc/pam.d
 	newins ${FILESDIR}/pam_d_omauth omauth
 
-	doetc ${FILESDIR}/omreg.cfg
+	insinto /etc
+	doins ${FILESDIR}/omreg.cfg
+
+	dodir /usr/bin
+	for exe in omreport omconfig omhelp; do
+		ln -s /opt/dell/srvadmin/oma/bin/${exe} ${D}/usr/bin/${exe}
+	done
 }
+
+pkg_postinst() {
+	elog "Once the servers have started, connect to https://localhost:1311/"
+}
\ No newline at end of file
diff --git a/app-admin/dellomsa/files/init_d_dellomsa b/app-admin/dellomsa/files/init_d_dellomsa
index f5305bb..e5f048c 100755
--- a/app-admin/dellomsa/files/init_d_dellomsa
+++ b/app-admin/dellomsa/files/init_d_dellomsa
@@ -21,6 +21,8 @@ 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"
 
+OVERRIDE_LD_LIBRARY_PATH=/opt/dell/srvadmin/jre/lib/i386/client
+
 checkconfig() {
 	gen_keys || return 1
 
@@ -44,8 +46,9 @@ start() {
 	eend $?
 
 	ebegin "Starting Dell OpenManage Connection Server"
-	start-stop-daemon --start --exec "${DSM_OM_CONN_SERVER}"
-	    --pidfile "${DSM_OM_CONN_SERVER_PID}" -- -run
+    LD_LIBRARY_PATH=${OVERRIDE_LD_LIBRARY_PATH} \
+    	start-stop-daemon --start --exec "${DSM_OM_CONN_SERVER}"
+        	    --pidfile "${DSM_OM_CONN_SERVER_PID}" -- -run
 	eend $?
 }