kernel-power-settings: Remove old files and hooks in postinst/postrm scripts

diff --git a/kernel-power-settings/debian/postinst b/kernel-power-settings/debian/postinst
index 8df7aaf..ea5efe6 100644 (file)
--- a/kernel-power-settings/debian/postinst
+++ b/kernel-power-settings/debian/postinst
@@ -2,17 +2,19 @@
 
 set -e
 
-# move old upstart scripts out of the way
-cd /etc/event.d
-test -f kernel && mv kernel /root/kernel.upstart.old
-test -f kernel-maemo && mv kernel-maemo /root/kernel-maemo.upstart.old
-cd /etc
-test -f lastboot && rm lastboot
-test -f lastreboot && rm lastreboot
-
+# remove old files
+rm -f /etc/event.d/kernel
+rm -f /etc/event.d/kernel-maemo
+rm -f /etc/lastboot
+rm -f /etc/lastreboot
 rm -f /etc/kernel-power/pre-mount
 rm -f /etc/default/kernel-boot
 
+# remove old hook
+if grep -q '# KERNEL-POWER-HOOK' /etc/default/mount-opts; then
+    sed '/# KERNEL-POWER-HOOK/d' -i /etc/default/mount-opts
+fi
+
 update-sudoers
 
 #DEBHELPER#

diff --git a/kernel-power-settings/debian/postrm b/kernel-power-settings/debian/postrm
index bab1bab..ee78538 100644 (file)
--- a/kernel-power-settings/debian/postrm
+++ b/kernel-power-settings/debian/postrm
@@ -2,17 +2,10 @@
 
 set -e
 
-if grep -q "# KERNEL-POWER-HOOK" /etc/default/mount-opts; then
-    grep -v "# KERNEL-POWER-HOOK" /etc/default/mount-opts > /etc/default/mount-opts.tmp
-    mv /etc/default/mount-opts.tmp /etc/default/mount-opts
-fi
-
-case "$1" in
-purge)
+if test "$1" = "purge"; then
     rm -f /etc/default/kernel-power /etc/default/kernel-boot
     rm -rf /etc/kernel-power
-    ;;
-esac
+fi
 
 #DEBHELPER#