[debian-edu-commits] r81707 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-15 14:37:40 +0000 (Mon, 15 Jul 2013)
New Revision: 81707

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/nbdswap-cleanup
Log:
Fix code avoiding several nbdswap-cleanup processes to run at
once, making sure the script to not consider itself as a
conflicting cleanup process (Closes: #662843).

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-15 14:25:15 UTC (rev 81706)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-15 14:37:40 UTC (rev 81707)
@@ -4,6 +4,9 @@
   * Rewrite /etc/shutdown-at-night/clients-generator to list hostname
     and MAC address the way wakeupclients now expect it (Closes:
     #662868).
+  * Fix code avoiding several nbdswap-cleanup processes to run at
+    once, making sure the script to not consider itself as a
+    conflicting cleanup process (Closes: #662843).
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 15 Jul 2013 16:23:46 +0200
 

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/nbdswap-cleanup
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/nbdswap-cleanup	2013-07-15 14:25:15 UTC (rev 81706)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/nbdswap-cleanup	2013-07-15 14:37:40 UTC (rev 81707)
@@ -15,7 +15,9 @@
 
 # exit if its already running
 # (this shouldnt happen - but will happen if lsof hangs)
-ps fax|grep -v grep|grep -q $0 && exit 0
+if ps fax | egrep -v "grep|^ *$$" | grep -q $0 ; then
+    exit 0
+fi
 
 #known language
 LANG=C