From 1ed2959463617c84543e062ef3acff395efb02ea Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Fri, 27 Jul 2012 10:14:56 +0000
Subject: [PATCH] Update SVR4 packaging for Solaris 11
---
opends/resource/unconfigure | 17 +++++++++++------
opends/resource/configure | 17 ++++++++++++++---
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/opends/resource/configure b/opends/resource/configure
index b56ea04..cf148a4 100755
--- a/opends/resource/configure
+++ b/opends/resource/configure
@@ -41,6 +41,17 @@
SCRIPT_NAME=configure
export SCRIPT_NAME
+case `uname -r` in
+ *10)
+ MANIFEST=/var/svc/manifest/network/ldap/opendj-manifest.xml
+ IMPORTSVC="/usr/sbin/svccfg import $MANIFEST"
+ ;;
+ *11)
+ MANIFEST=/lib/svc/manifest/network/ldap/opendj-manifest.xml
+ IMPORTSVC="/usr/sbin/svcadm restart svc:/system/manifest-import:default"
+ ;;
+esac
+
# Check if running as root. This is required to be able to copy files and
# enable SMF
if [[ `id -u` -ne 0 ]]
@@ -90,13 +101,13 @@
IFS=${CURRENT_IFS}
if test "${USERNAME}" = "ldap" -a "$GROUPNAME" = "ldap"
then
- cp ${INSTALL_ROOT}/resources/opendj-manifest.xml /var/svc/manifest/network/ldap/
+ cp ${INSTALL_ROOT}/resources/opendj-manifest.xml $MANIFEST
else
cat ${INSTALL_ROOT}/resources/opendj-manifest.xml | sed -e "s/user='ldap/user='${USERNAME}/;s/group='ldap/group='${GROUPNAME}/" > /tmp/opendj-manifest.$$
- cp /tmp/opendj-manifest.$$ /var/svc/manifest/network/ldap/opendj-manifest.xml
+ cp /tmp/opendj-manifest.$$ $MANIFEST
rm /tmp/opendj-manifest.$$
fi
- /usr/sbin/svccfg import /var/svc/manifest/network/ldap/opendj-manifest.xml
+ $IMPORTSVC
fi
exit ${RETURN_CODE}
fi
diff --git a/opends/resource/unconfigure b/opends/resource/unconfigure
index 265f159..d5a12ce 100755
--- a/opends/resource/unconfigure
+++ b/opends/resource/unconfigure
@@ -106,12 +106,17 @@
fi
echo "Disabling SMF service ..."
-# Now update SMF manifest, delete it and remove the file from /var/svc/manifest
-echo select network/ldap/server > /tmp/opendj-unconfigure.$$
-echo delete opendj >> /tmp/opendj-unconfigure.$$
-/usr/sbin/svccfg -f /tmp/opendj-unconfigure.$$
-rm /tmp/opendj-unconfigure.$$
-rm /var/svc/manifest/network/ldap/opendj-manifest.xml
+if [ `uname -r` = "5.10" ]; then
+ # Now update SMF manifest, delete it and remove the file from /var/svc/manifest
+ echo select network/ldap/server > /tmp/opendj-unconfigure.$$
+ echo delete opendj >> /tmp/opendj-unconfigure.$$
+ /usr/sbin/svccfg -f /tmp/opendj-unconfigure.$$
+ rm /tmp/opendj-unconfigure.$$
+ rm /var/svc/manifest/network/ldap/opendj-manifest.xml
+else
+ rm /lib/svc/manifest/network/ldap/opendj-manifest.xml
+ /usr/sbin/svcadm restart svc:/system/manifest-import:default
+fi
echo "Resetting instance location ..."
# Launch the unconfigure process.
--
Gitblit v1.10.0