[maemo-commits] [maemo-commits] r19158 - in projects/haf/trunk/ke-recv: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-08-19 15:51:53 +0300 (Wed, 19 Aug 2009)
New Revision: 19158

Modified:
   projects/haf/trunk/ke-recv/debian/init.d
   projects/haf/trunk/ke-recv/debian/ke-recv.upstart
   projects/haf/trunk/ke-recv/src/ke-recv.c
Log:
do not run in ACT_DEAD mode..


Modified: projects/haf/trunk/ke-recv/debian/init.d
===================================================================
--- projects/haf/trunk/ke-recv/debian/init.d	2009-08-19 12:48:57 UTC (rev 19157)
+++ projects/haf/trunk/ke-recv/debian/init.d	2009-08-19 12:51:53 UTC (rev 19158)
@@ -60,11 +60,6 @@
 	# Start daemons
 	echo -n "Starting $DESC: "
 
-        # check if this is the first boot
-        if [ -e /home/user/first-boot-flag ]; then
-                export FIRST_BOOT=1
-        fi
-
         # check if this is TA image
         if [ -x /usr/bin/sysinfo-tool ]; then
                 sysinfo-tool -g /device/sw-release-ver | grep -q _TA_

Modified: projects/haf/trunk/ke-recv/debian/ke-recv.upstart
===================================================================
--- projects/haf/trunk/ke-recv/debian/ke-recv.upstart	2009-08-19 12:48:57 UTC (rev 19157)
+++ projects/haf/trunk/ke-recv/debian/ke-recv.upstart	2009-08-19 12:51:53 UTC (rev 19158)
@@ -3,6 +3,7 @@
 
 start on started hal
 stop on stopping hal
+stop on ACT_DEAD
 console none
 
 script

Modified: projects/haf/trunk/ke-recv/src/ke-recv.c
===================================================================
--- projects/haf/trunk/ke-recv/src/ke-recv.c	2009-08-19 12:48:57 UTC (rev 19157)
+++ projects/haf/trunk/ke-recv/src/ke-recv.c	2009-08-19 12:51:53 UTC (rev 19158)
@@ -1817,21 +1817,6 @@
         return ret;
 }
 
-static gboolean is_actdead_mode(void)
-{
-        gchar *buf = NULL;
-        gboolean is_state;
-
-        is_state = g_file_get_contents("/tmp/STATE", &buf, NULL, NULL);
-        if (is_state && strncmp("ACT_DEAD", buf, 8) == 0) {
-                g_free(buf);
-                return TRUE;
-        }
-        if (buf)
-                g_free(buf);
-        return FALSE;
-}
-
 static usb_state_t check_usb_cable(void)
 {
         usb_state_t state;
@@ -3372,13 +3357,6 @@
                 desktop_started = TRUE;
         }
 
-#if 0
-        if (getenv("FIRST_BOOT") != NULL) {
-                ULOG_DEBUG_F("this is the first boot");
-                first_boot = TRUE;
-        }
-#endif
-
         if (desktop_started && usb_state != S_INVALID_USB_STATE
             && !mmc_initialised) {
                 /* initialise GConf keys and possibly mount or USB-share */