[osiris-devel] osiris-4.0.0 released

[osiris-devel at lemmin.gs]

Hi Brian,

Attached are 3 patches to make building of RPM packages easier. Please apply.

emmanuel
-------------- next part --------------
--- osiris-4.0.0-rc/src/install/install.sh.in.orig	2004-04-26 19:29:52.000000000 +1000
+++ osiris-4.0.0-rc/src/install/install.sh.in	2004-04-26 19:33:51.000000000 +1000
@@ -634,12 +634,12 @@
 
     if [ ! -d ${INSTALL_DIR} ]; then
         echo "Installation directory doesn't exist, creating."
-        ${MKDIR} ${INSTALL_DIR}
+        ${MKDIR} -p ${INSTALL_DIR}
     fi
 
     if [ ! -d ${DESTDIR}${OSIRIS_DIR} ]; then
         echo "Osiris root directory doesn't exist, creating."
-        ${MKDIR} ${DESTDIR}${OSIRIS_DIR}
+        ${MKDIR} -p ${DESTDIR}${OSIRIS_DIR}
     fi
 }
 
@@ -697,9 +697,13 @@
         ${RM} -rf ${RC_D}/rc4.d/S80osirisd
         ${RM} -rf ${RC_D}/rc5.d/S80osirisd
 
-        ${LN} -s ${INIT_D}/osirisd ${RC_D}/rc3.d/S80osirisd
-        ${LN} -s ${INIT_D}/osirisd ${RC_D}/rc4.d/S80osirisd
-        ${LN} -s ${INIT_D}/osirisd ${RC_D}/rc5.d/S80osirisd
+	if [ ${PACKAGE_MODE} -eq 1 ]; then
+	    echo "==> Skipping osirisd symlink creation."
+	else
+	    ${LN} -s ${INIT_D}/osirisd ${RC_D}/rc3.d/S80osirisd
+	    ${LN} -s ${INIT_D}/osirisd ${RC_D}/rc4.d/S80osirisd
+	    ${LN} -s ${INIT_D}/osirisd ${RC_D}/rc5.d/S80osirisd
+	fi
     fi
 
     if [ $INSTALL_OSIRISM != 0 -a -f ./osirismd ]; then
@@ -710,9 +714,13 @@
         ${RM} -rf ${RC_D}/rc4.d/S80osirismd
         ${RM} -rf ${RC_D}/rc5.d/S80osirismd
 
-        ${LN} -s ${INIT_D}/osirismd ${RC_D}/rc3.d/S80osirismd
-        ${LN} -s ${INIT_D}/osirismd ${RC_D}/rc4.d/S80osirismd
-        ${LN} -s ${INIT_D}/osirismd ${RC_D}/rc5.d/S80osirismd
+	if [ ${PACKAGE_MODE} -eq 1 ]; then
+	    echo "==> Skipping osirismd symlink creation."
+	else
+	    ${LN} -s ${INIT_D}/osirismd ${RC_D}/rc3.d/S80osirismd
+	    ${LN} -s ${INIT_D}/osirismd ${RC_D}/rc4.d/S80osirismd
+	    ${LN} -s ${INIT_D}/osirismd ${RC_D}/rc5.d/S80osirismd
+	fi
     fi
     ;;
 
-------------- next part --------------
--- osiris-4.0.0-rc/src/install/linux/osirisd.redhat.orig	2004-04-05 07:24:52.000000000 +1000
+++ osiris-4.0.0-rc/src/install/linux/osirisd.redhat	2004-04-26 20:34:45.000000000 +1000
@@ -15,11 +15,12 @@
 
 prog=osirisd
 osirisd="@INSTALLDIR@/osirisd"
+osirisd_root=${OSIRIS_ROOT- at OSIRISDIR@}
 RETVAL=0
 
 start() {
         echo -n $"Starting $prog: "
-        daemon $osirisd -r @OSIRISDIR@ $OPTIONS
+        daemon $osirisd -r $osirisd_root $OPTIONS
         RETVAL=$?
         echo
         [ $RETVAL = 0 ] && touch /var/lock/subsys/osirisd
-------------- next part --------------
--- osiris-4.0.0-rc/src/install/linux/osirismd.redhat.orig	2004-04-05 07:24:52.000000000 +1000
+++ osiris-4.0.0-rc/src/install/linux/osirismd.redhat	2004-04-26 23:36:28.000000000 +1000
@@ -15,11 +15,13 @@
 
 prog=osirismd
 osirismd="@INSTALLDIR@/osirismd"
+osirismd_root=${OSIRIS_ROOT-/var/lib/osirismd}
+osirismd_conf=${OSIRIS_CONF-/etc/osirismd/osirismd.conf}
 RETVAL=0
 
 start() {
         echo -n $"Starting $prog: "
-        daemon $osirismd -r @OSIRISDIR@ $OPTIONS
+        daemon --user osirismd $osirismd -f $osirismd_conf -r $osirismd_root $OPTIONS
         RETVAL=$?
         echo
         [ $RETVAL = 0 ] && touch /var/lock/subsys/osirismd