Changeset 3 for trunk/dsys

Timestamp:

Dec 21, 2005, 10:07:54 PM (19 years ago)

Author:

rainer

Message:

More fixes for update function, released 2.1.1 version.

Location:

trunk/dsys

Files:

• comINSTALL (modified) (6 diffs)
• funcINSTALL (modified) (2 diffs)

trunk/dsys/comINSTALL

@@ -340 +340 @@
     #---------------------------------------------------------------------
 
+    instlock="${yule_conf}.lockdir";
+    trap "rm -rf ${instlock}" 1 2 13 15
+
+    if test x"$simulate" = x0
+    then
+        #
+        # A lockfile will not work, because 'root' can write anyway.
+        # However, 'mkdir' an existing directory will fail even for root
+        #
+        until (umask 222; mkdir "${instlock}") 2>/dev/null   # test & set
+        do
+           printINFO "Waiting for lock"
+           sleep 1
+        done
+    fi
+
     Replace=`"${yule_exec}" -P "${is_passwd}" | sed s%HOSTNAME%${host}%g`
     if test "x$Replace" = x
     then
+        rm -rf "${instlock}"
         printFATAL "Could not execute ${yule_exec} -P ${is_passwd}."
     fi
@@ -356 +373 @@
             then
                 Seen=y
-                echo "$Replace" >>"$tmpF" || printFATAL "Cannot write new server configuration."
+                echo "$Replace" >>"$tmpF" 
+                if [ $? -ne 0 ]; then
+                        rm -rf "${instlock}"
+                        printFATAL "Cannot write new server configuration."
+                fi
             fi
         else
@@ -363 +384 @@
                 :
             else
-                echo "$line" >>"$tmpF" || printFATAL "Cannot write new server configuration."
+                echo "$line" >>"$tmpF"
+                if [ $? -ne 0 ]; then
+                        rm -rf "${instlock}"
+                        printFATAL "Cannot write new server configuration."
+                fi
             fi
         fi
@@ -380 +405 @@
     if test x"$simulate" = x0
     then
-        ageFILE "${yule_conf}" || printFATAL "Could not backup ${yule_conf}."
-        rm -f "${yule_conf}" && { cp "$tmpF"  "${yule_conf}" || printFATAL "Could not write new server config. Backup is ${yule_conf}.1"; }
-        chown ${rcfile_owner}:${rcfile_group} "${yule_conf}" || printFATAL "Could not chown ${rcfile_owner}:${rcfile_group} ${yule_conf}"
-        chmod ${rcfile_perm} "${yule_conf}" || printFATAL "Could not chmod ${rcfile_perm} ${yule_conf}"
+        ageFILE "${yule_conf}"
+        if [ $? -ne 0 ]; then
+                rm -rf "${instlock}"
+                printFATAL "Could not backup ${yule_conf}"
+        fi
+
+        rm -f "${yule_conf}" && cp "$tmpF"  "${yule_conf}"
+        if [ $? -ne 0 ]; then
+                rm -rf "${instlock}"
+                printFATAL "Could not write new server config. Backup is ${yule_conf}.1"
+        fi
+
+        chown ${rcfile_owner}:${rcfile_group} "${yule_conf}"
+        if [ $? -ne 0 ]; then
+                rm -rf "${instlock}"
+                printFATAL "Could not chown ${rcfile_owner}:${rcfile_group} ${yule_conf}"
+        fi
+
+        chmod ${rcfile_perm} "${yule_conf}"
+        if [ $? -ne 0 ]; then
+                rm -rf "${instlock}"
+                printFATAL "Could not chmod ${rcfile_perm} ${yule_conf}"
+        fi
     else
         printINFO "Backup and update ${yule_conf}"
@@ -423 +467 @@
         sleep 5
         #
+        rm -rf "${instlock}"
     else
         printINFO "Reloading server configuration."
@@ -428 +473 @@
 
     printLOG "Server configuration updated and reloaded."
+
 
     #---------------------------------------------------------------------

trunk/dsys/funcINSTALL

@@ -91 +91 @@
         DATABASE="${basedir}/${defdatabase}"
     fi
+
+    updlock="${DATABASE}.lockdir"
+    trap "rm -rf ${updlock}" 1 2 13 15
+
+    #
+    # A lockfile will not work, because 'root' can write anyway.
+    # However, 'mkdir' an existing directory will fail even for root
+    #
+    until (umask 222; mkdir "${updlock}") 2>/dev/null   # test & set
+    do
+       printINFO "Waiting for lock"
+       sleep 1
+    done
+
 
     IDATE=`date +"%Y-%m-%d %H:%M:%S"`
@@ -223 +237 @@
     fi
 
-    chown ${rcfile_owner}:${rcfile_group} "${DATABASE}" || printFATAL "Could not chown ${rcfile_owner}:${rcfile_group} ${DATABASE}"
-    chmod ${rcfile_perm} "${DATABASE}" || printFATAL "Could not chmod ${rcfile_perm} ${DATABASE}"
-
+    chown ${rcfile_owner}:${rcfile_group} "${DATABASE}"
+    if [ $? -ne 0 ]; then
+        rm -rf "${instlock}"
+        printFATAL "Could not chown ${rcfile_owner}:${rcfile_group} ${DATABASE}"
+    fi
+    chmod ${rcfile_perm} "${DATABASE}"
+    if [ $? -ne 0 ]; then
+        rm -rf "${instlock}"
+        printFATAL "Could not chmod ${rcfile_perm} ${DATABASE}"
+    fi
+
+    rm -rf "${updlock}"
 }