Fixed executing /etc/kernel-power/pre-mount from /etc/default/mount-opts

diff --git a/kernel-power-settings/debian/install b/kernel-power-settings/debian/install
new file mode 100644 (file)
index 0000000..d00e91a
--- /dev/null
+++ b/kernel-power-settings/debian/install
@@ -0,0 +1,9 @@
+kernel-load /usr/sbin
+kernel-config /usr/sbin
+pre-mount /etc/kernel-power
+kernel-modules /etc/event.d
+kernel-power /etc/event.d
+kernel-power-shutdown /etc/event.d
+kernel-power.sudoers /etc/sudoers.d
+kernel-power.conf /etc/osso-backup/applications
+config/* /usr/share/kernel-power-settings

diff --git a/kernel-power-settings/debian/kernel-power-settings.install b/kernel-power-settings/debian/kernel-power-settings.install
deleted file mode 100644 (file)
index d00e91a..0000000
--- a/kernel-power-settings/debian/kernel-power-settings.install
+++ /dev/null
@@ -1,9 +0,0 @@
-kernel-load /usr/sbin
-kernel-config /usr/sbin
-pre-mount /etc/kernel-power
-kernel-modules /etc/event.d
-kernel-power /etc/event.d
-kernel-power-shutdown /etc/event.d
-kernel-power.sudoers /etc/sudoers.d
-kernel-power.conf /etc/osso-backup/applications
-config/* /usr/share/kernel-power-settings

diff --git a/kernel-power-settings/debian/kernel-power-settings.postinst b/kernel-power-settings/debian/kernel-power-settings.postinst
deleted file mode 100644 (file)
index d70e93c..0000000
--- a/kernel-power-settings/debian/kernel-power-settings.postinst
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# 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
-
-# install premount hook
-if ! grep -q "# KERNEL-POWER-HOOK" /etc/default/mount-opts; then
-       echo "test -x /etc/kernel-power/pre-mount && /etc/kernel-power/pre-mount # KERNEL-POWER-HOOK" >> /etc/default/mount-opts
-fi
-
-bootcfg=/etc/default/kernel-boot
-test -f $bootcfg || cp /usr/share/kernel-power-settings/boot $bootcfg
-
-update-sudoers
-
-#DEBHELPER#
-
-exit 0

diff --git a/kernel-power-settings/debian/kernel-power-settings.postrm b/kernel-power-settings/debian/kernel-power-settings.postrm
deleted file mode 100644 (file)
index f8e8555..0000000
--- a/kernel-power-settings/debian/kernel-power-settings.postrm
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-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)
-    rm -f /etc/default/kernel-power /etc/default/kernel-boot
-    rm -rf /etc/kernel-power
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0

diff --git a/kernel-power-settings/debian/postinst b/kernel-power-settings/debian/postinst
new file mode 100644 (file)
index 0000000..2d9e607
--- /dev/null
+++ b/kernel-power-settings/debian/postinst
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+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
+
+# install premount hook
+if ! grep -q "# KERNEL-POWER-HOOK" /etc/default/mount-opts; then
+       echo "sh /etc/kernel-power/pre-mount || true # KERNEL-POWER-HOOK" >> /etc/default/mount-opts
+fi
+
+bootcfg=/etc/default/kernel-boot
+test -f $bootcfg || cp /usr/share/kernel-power-settings/boot $bootcfg
+
+update-sudoers
+
+#DEBHELPER#
+
+exit 0

diff --git a/kernel-power-settings/debian/postrm b/kernel-power-settings/debian/postrm
new file mode 100644 (file)
index 0000000..bab1bab
--- /dev/null
+++ b/kernel-power-settings/debian/postrm
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+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)
+    rm -f /etc/default/kernel-power /etc/default/kernel-boot
+    rm -rf /etc/kernel-power
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0