From: Pali Rohár <pali.rohar@gmail.com>
Date: Tue, 5 Mar 2013 21:41:24 +0000 (+0100)
Subject: kernel-power-settings: Remove EARLY_SSH support because calling getbootstate
X-Git-Tag: kernel-power-settings-0.17~4
X-Git-Url: http://git.maemo.org/git/?p=kernel-power;a=commitdiff_plain;h=a9a8937c10283a06757c798ffe1949d3e7cb4456

kernel-power-settings: Remove EARLY_SSH support because calling getbootstate

* getbootstate increasing rebooot counter which can cause MALF state and unbootable device
---

diff --git a/kernel-power-settings/config/boot b/kernel-power-settings/config/boot
deleted file mode 100644
index 5872a2b..0000000
--- a/kernel-power-settings/config/boot
+++ /dev/null
@@ -1,5 +0,0 @@
-# boot options for kernel-power-settings
-
-# start USB networking and sshd early during boot
-# 0=off, 1=on
-EARLY_SSH=0
diff --git a/kernel-power-settings/debian/postinst b/kernel-power-settings/debian/postinst
index 7fb16ea..8df7aaf 100644
--- a/kernel-power-settings/debian/postinst
+++ b/kernel-power-settings/debian/postinst
@@ -11,9 +11,7 @@ test -f lastboot && rm lastboot
 test -f lastreboot && rm lastreboot
 
 rm -f /etc/kernel-power/pre-mount
-
-bootcfg=/etc/default/kernel-boot
-test -f $bootcfg || cp /usr/share/kernel-power-settings/boot $bootcfg
+rm -f /etc/default/kernel-boot
 
 update-sudoers
 
diff --git a/kernel-power-settings/kernel-power b/kernel-power-settings/kernel-power
index b53ef03..bb68748 100644
--- a/kernel-power-settings/kernel-power
+++ b/kernel-power-settings/kernel-power
@@ -11,15 +11,6 @@ script
         exit 1
     fi
     touch /etc/kernel-power/.loaded
-    if test -f /etc/default/kernel-boot && test `/sbin/getbootstate` = USER; then
-        source /etc/default/kernel-boot
-        if test "$EARLY_SSH" = 1 && test -x /etc/init.d/ssh; then
-            /sbin/modprobe g_nokia
-	    sleep 1
-            /sbin/ifup usb0
-            /etc/init.d/ssh start
-        fi
-    fi
     test -f /etc/default/kernel-power || exit 1
     test -x /usr/sbin/kernel-config || exit 1
     /usr/sbin/kernel-config load
diff --git a/kernel-power-settings/kernel-power.conf b/kernel-power-settings/kernel-power.conf
index be33984..def4acf 100644
--- a/kernel-power-settings/kernel-power.conf
+++ b/kernel-power-settings/kernel-power.conf
@@ -6,8 +6,5 @@
 		<location type="file" category="settings">
 			/etc/default/kernel-power
 		</location>
-		<location type="file" category="settings">
-			/etc/default/kernel-boot
-		</location>
 	</locations>
 </backup-configuration>