Modify the ntpd handling to use the generic locking infrastructure, tab fixes.
diff -U 0 -rNX diffignore pm-utils.updates/pm/sleep.d/90clock working/pm/sleep.d/90clock
--- pm-utils.updates/pm/sleep.d/90clock 2008-01-27 11:58:02.000000000 -0600
+++ working/pm/sleep.d/90clock 2008-01-26 13:56:11.000000000 -0600
@@ -3,0 +3,4 @@
+NTPD_LOCK=/tmp/.pm-ntpd.lock
+release_ntpd_lock() {
+ rmdir "${NTPD_LOCK}"
+}
@@ -6,7 +9,6 @@
- if [ ! -f /var/run/pm-ntpd.lock ]; then
- touch /var/run/pm-ntpd.lock
- stopservice ntpd
- fi
-
- /sbin/hwclock --systohc >/dev/null 2>&1 0<&1
- return $?
+ if try_lock "${NTPD_LOCK}"; then
+ trap release_ntpd_lock 0
+ stopservice ntpd
+ fi
+ /sbin/hwclock --systohc >/dev/null 2>&1 0<&1
+ return $?
@@ -16,10 +18,8 @@
- /sbin/hwclock --hctosys >/dev/null 2>&1 0<&1
- rc=$?
-
- # Bring back ntpd _after_ NetworkManager and such come back...
- ( touch /var/run/pm-ntpd.lock ;
- sleep 20 ;
- restartservice ntpd ;
- rm -f /var/run/pm-ntpd.lock
- ) &
- return $rc
+ /sbin/hwclock --hctosys >/dev/null 2>&1 0<&1
+ rc=$?
+ # Bring back ntpd _after_ NetworkManager and such come back...
+ ( spin_lock "${NTPD_LOCK}";
+ trap release_ntpd_lock 0
+ sleep 20;
+ restartservice ntpd; ) &
+ return $rc
_______________________________________________
Pm-utils mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/pm-utils
