From: Pali Rohár <pali.rohar@gmail.com>
Date: Sat, 16 Feb 2013 19:32:46 +0000 (+0100)
Subject: kernel-power-settings: Remove pre-mount script from /etc/kernel-power/pre-mount,... 
X-Git-Tag: kernel-power-settings-0.17~5
X-Git-Url: https://vcs.maemo.org/git/?p=kernel-power;a=commitdiff_plain;h=409a699ada8f28213cd4dc1999d3cd9510b1a7a6

kernel-power-settings: Remove pre-mount script from /etc/kernel-power/pre-mount, cssu will have better solution for fsck
---

diff --git a/kernel-power-settings/config/boot b/kernel-power-settings/config/boot
index b4405b4..5872a2b 100644
--- a/kernel-power-settings/config/boot
+++ b/kernel-power-settings/config/boot
@@ -1,9 +1,5 @@
 # boot options for kernel-power-settings
 
-# fsck of /home partition before mounting?
-# 0=never, 1=if necessary, force=always check
-FSCK_HOME=0
-
 # start USB networking and sshd early during boot
 # 0=off, 1=on
 EARLY_SSH=0
diff --git a/kernel-power-settings/debian/install b/kernel-power-settings/debian/install
index d00e91a..3d9553a 100644
--- a/kernel-power-settings/debian/install
+++ b/kernel-power-settings/debian/install
@@ -1,6 +1,5 @@
 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
diff --git a/kernel-power-settings/debian/postinst b/kernel-power-settings/debian/postinst
index 2d9e607..7fb16ea 100644
--- a/kernel-power-settings/debian/postinst
+++ b/kernel-power-settings/debian/postinst
@@ -10,10 +10,7 @@ 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
+rm -f /etc/kernel-power/pre-mount
 
 bootcfg=/etc/default/kernel-boot
 test -f $bootcfg || cp /usr/share/kernel-power-settings/boot $bootcfg
diff --git a/kernel-power-settings/pre-mount b/kernel-power-settings/pre-mount
deleted file mode 100755
index 9c01879..0000000
--- a/kernel-power-settings/pre-mount
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-# pre-mounting script
-# called by /etc/default/mount-opts sourced by /etc/event.d/rcS-late
-# (c) Copyright 2010 by Thomas Tanner <maemo@tannerlab.com>
-# licensed under GPLv3
-# version 0.2 (9. May 2010)
-log=/etc/kernel-power/pre-mount.log
-
-if test -f /etc/kernel-power/pre-mount.once; then
-	# execute pre-mount script once
-	mv /etc/kernel-power/pre-mount.once /etc/kernel-power/pre-mount.done
-	date >> $log
-	echo executing pre-mount.once >> $log
-	sh /etc/kernel-power/pre-mount.done >> $log
-	echo pre-mount.once was successfully executed >> $log
-fi
-
-fforce=/etc/kernel-power/force_fsck
-#temporarly overwrite 0=off, 1=on
-force=
-if test -f $fforce; then
-    force=`cat $fforce` 
-    date >> $log
-    if test ! "$force" = 1; then
-    	rm $fforce # disabled
-	echo fsck is temporarily disabled >> $log
-    	exit 0
-    fi
-    echo fsck is temporarily enabled >> $log
-else
-    cfg=/etc/default/kernel-boot
-    test -f $cfg || exit 0
-    FSCK_HOME=0
-    source $cfg
-    if test "$FSCK_HOME" = 1; then
-	force=
-    elif test "$FSCK_HOME" = force; then
-    	force=1
-    else
-    	exit 0 # disabled
-    fi 
-fi
-
-part=`sfdisk -l /dev/mmcblk0 | awk '$6 == 83 { print $1; exit }'`
-test -z "$part" && exit 0
-
-mkdir -p /etc/kernel-power/
-date >> $log
-
-# dont continue if reboot during fsck
-echo 0 > $fforce
-test "$force" = 1 && force="-f"
-fsck -y $force -t ext3 $part >> $log
-echo fsck successfully finished >> $log
-
-rm $fforce # use defaults
-
-exit 0