X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=kernel-power-settings%2Fkernel-power;h=b53ef03696e96667b391feba73fa31649960bbcb;hb=e240cc318f6eebfc37687a05935d8888d51119e8;hp=1bed8d4e8d59e30554b10a85de62a2635eac411c;hpb=b7d753ce71e03c3c2279953b63f87342f1f0ba18;p=kernel-bfs

diff --git a/kernel-power-settings/kernel-power b/kernel-power-settings/kernel-power
index 1bed8d4..b53ef03 100644
--- a/kernel-power-settings/kernel-power
+++ b/kernel-power-settings/kernel-power
@@ -10,23 +10,18 @@ script
         touch /etc/kernel-power/.notloaded
         exit 1
     fi
-    test -f /etc/default/kernel-power || exit 1
-    STATE=`/sbin/getbootstate`
-    if test $STATE = USER; then
-        source /etc/default/kernel-power
-        if test "$EARLYSSH" = 1 && test -x /etc/init.d/ssh; then
+    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
-    touch /etc/kernel-power/.loaded
-    /usr/sbin/kernel-config defaults
+    /usr/sbin/kernel-config load
     exit 0
 end script
-
-post-stop script
-    rm -f /etc/kernel-power/.loaded
-    rm -f /etc/kernel-power/.notloaded
-end script