Merge branch 'vlowther-reorganize-hooks'

8 files changed, 41 insertions, 49 deletions

diff --git a/pm/sleep.d/05led b/pm/sleep.d/05led
deleted file mode 100755
index b4bb970..0000000
--- a/pm/sleep.d/05led
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# On an IBM system. make the suspend LED blink.
-# TODO: Merge with 95led?  Should be trivial.
-
-[ -f /proc/acpi/ibm/led ] || exit $NA
-
-case "$1" in
-	hibernate|suspend)
-		echo "7 blink" >/proc/acpi/ibm/led
-		;;
-	thaw|resume) 
-		echo "7 off" >/proc/acpi/ibm/led
-		;;
-	*) exit $NA
-		;;
-esac
diff --git a/pm/sleep.d/50ntpd b/pm/sleep.d/50ntpd
new file mode 100755
index 0000000..4b59abf
--- /dev/null
+++ b/pm/sleep.d/50ntpd
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+NTPD_LOCK="pm-ntpd.lock"
+
+stop_ntp()
+{
+	if try_lock "${NTPD_LOCK}"; then
+		trap 'release_lock "${NTPD_LOCK}"' 0
+		stopservice ntpd
+	fi
+
+start_ntp()
+{
+	# Bring back ntpd _after_ NetworkManager and such come back...
+	( spin_lock "${NTPD_LOCK}";
+	trap 'release_lock "${NTPD_LOCK}"' 0
+	sleep 20
+	restartservice ntpd; ) &
+}
+
+case "$1" in
+	hibernate|suspend) stop_ntp ;;
+	thaw|resume) start_ntp ;;
+	*) exit $NA ;;
+esac
diff --git a/pm/sleep.d/10NetworkManager b/pm/sleep.d/55NetworkManager
index 244e2c7..244e2c7 100755
--- a/pm/sleep.d/10NetworkManager
+++ b/pm/sleep.d/55NetworkManager
diff --git a/pm/sleep.d/50modules b/pm/sleep.d/75modules
index 3f292e4..3f292e4 100755
--- a/pm/sleep.d/50modules
+++ b/pm/sleep.d/75modules
diff --git a/pm/sleep.d/00clear b/pm/sleep.d/90chvt
index 47a2c85..47a2c85 100755
--- a/pm/sleep.d/00clear
+++ b/pm/sleep.d/90chvt
diff --git a/pm/sleep.d/90clock b/pm/sleep.d/90clock
index 985b266..d824778 100755
--- a/pm/sleep.d/90clock
+++ b/pm/sleep.d/90clock
@@ -1,41 +1,22 @@
 #!/bin/sh
 # Synchronize system time with hardware time.
-# TODO: Split NTP handling to its own hook. Having it here is ugly and silly.
-#       Do modern kernels handle this correctly?  If so, we should detect that
+# TODO: Do modern kernels handle this correctly?  If so, we should detect that
 #       and skip this hook.
 
 . "${PM_FUNCTIONS}"
 
-NTPD_LOCK="pm-ntpd.lock"
-
 suspend_clock()
 {
-	if try_lock "${NTPD_LOCK}"; then
-		trap 'release_lock "${NTPD_LOCK}"' 0
-		stopservice ntpd
-	fi
 	/sbin/hwclock --systohc >/dev/null 2>&1 0<&1
 }
 
 resume_clock()
 {
 	/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_lock "${NTPD_LOCK}"' 0
-		sleep 20; 
-		restartservice ntpd; ) &
-	return $rc
 }
 
 case "$1" in
-	hibernate|suspend)
-		suspend_clock
-		;;
-	thaw|resume)
-		resume_clock
-		;;
-	*) exit $NA
-		;;
+	hibernate|suspend) suspend_clock ;;
+	thaw|resume) resume_clock ;;
+	*) exit $NA ;;
 esac
diff --git a/pm/sleep.d/95led b/pm/sleep.d/95led
index 253f0b6..b4bb970 100755
--- a/pm/sleep.d/95led
+++ b/pm/sleep.d/95led
@@ -1,15 +1,16 @@
 #!/bin/sh
-# IBM specific hook to handle the suspend LED.
-# TODO: Merge with 05led.
+# On an IBM system. make the suspend LED blink.
+# TODO: Merge with 95led?  Should be trivial.
 
 [ -f /proc/acpi/ibm/led ] || exit $NA
 
 case "$1" in
-	thaw|resume)
+	hibernate|suspend)
 		echo "7 blink" >/proc/acpi/ibm/led
 		;;
-	*)
+	thaw|resume) 
+		echo "7 off" >/proc/acpi/ibm/led
+		;;
+	*) exit $NA
 		;;
 esac
-
-exit $NA
diff --git a/pm/sleep.d/Makefile.am b/pm/sleep.d/Makefile.am
index 5a9693c..d47b799 100644
--- a/pm/sleep.d/Makefile.am
+++ b/pm/sleep.d/Makefile.am
@@ -1,14 +1,15 @@
 sleepdir = $(libdir)/pm-utils/sleep.d
 
 sleep_SCRIPTS =			\
-	00clear			\
+	00logging		\
 	01grub			\
-	05led 			\
-	10NetworkManager	\
 	49bluetooth		\
-	50modules		\
+	50ntpd			\
 	55battery		\
+	55NetworkManager	\
 	65alsa			\
+	75modules		\
+	90chvt			\
 	90clock			\
 	94cpufreq		\
 	95led			\