- initscript ommits instance files which are renamed or generated by RPM

Changed files:
    Zope-start.sh -> 1.2
    Zope.init -> 1.8

diff --git a/Zope-start.sh b/Zope-start.sh
index 505ee44cc4943f828fd249753756dac6c1e1cf3e..b52d610b6d19f4ae7ef49585275e0b8d884e5b3b 100644 (file)
--- a/Zope-start.sh
+++ b/Zope-start.sh
@@ -83,7 +83,7 @@ fi
 if [ "x$IP_ADDRESS" = "x" -o "x$IP_ADDRESS" = "x0" ]; then
     ipstr=" "
 else
-    ipstr="-a $IP_ADDRESS"
+    ipstr="-a '$IP_ADDRESS'"
 fi
 
 # show what we're going to do

diff --git a/Zope.init b/Zope.init
index 9ad8a6d3642820b6b3f605a2dee3ef22b15d350c..dfd99ec741e88011a91292b1aea868bdebd74369 100644 (file)
--- a/Zope.init
+++ b/Zope.init
@@ -63,9 +63,10 @@ start_instances()
     for i in /etc/zope/instances/*
     do
        unset_vars
+       INSTANCE_NAME=`basename $i`
+       echo "$INSTANCE_NAME" | egrep -q "rpmsave|rpmorig" && continue
        . $i
        PIDFILE=$INSTANCE_HOME/var/Z2.pid
-       INSTANCE_NAME=`basename $i`
        if [ "x$INSTANCE_NAME" = "xmain" ]; then
            z_name="Zope"
        else