[Pkg-sysvinit-commits] r1021 - in sysvinit/trunk/debian: . initscripts/etc/network/if-up.d

[Petter Reinholdtsen]

Author: pere
Date: 2006-10-21 07:27:46 +0000 (Sat, 21 Oct 2006)
New Revision: 1021

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs
Log:
  * Print message when refusing to mount directoryes because the
    lockdir exist.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-10-21 07:25:10 UTC (rev 1020)
+++ sysvinit/trunk/debian/changelog	2006-10-21 07:27:46 UTC (rev 1021)
@@ -7,6 +7,8 @@
     exist.  (Closes: #393465, #391605, #390126)
   * Replace SElinux patches 40_selinux and 41_selinux_console with updated
     40_selinux from Manoj Srivastava. (Closes: #394304)
+  * Print message when refusing to mount directoryes because the
+    lockdir exist.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 19 Oct 2006 10:05:50 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs	2006-10-21 07:25:10 UTC (rev 1020)
+++ sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs	2006-10-21 07:27:46 UTC (rev 1021)
@@ -131,8 +131,14 @@
 
 # Lock around this otherwise insanity may occur
 mkdir /var/run/network          2>/dev/null || true
-mkdir /var/run/network/mountnfs 2>/dev/null || exit 0
 
+if mkdir /var/run/network/mountnfs 2>/dev/null ; then
+    :
+else
+    echo "if-up.d/mountnfs: lockdir /var/run/network/mountnfs exist, not doing NFS mounting"
+    exit 0
+fi
+
 do_start
 
 rmdir /var/run/network/mountnfs 2>/dev/null || exit 0