[maemo-commits] [maemo-commits] r8914 - in projects/haf/trunk/osso-af-startup: debian services

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-01-03 09:56:32 +0200 (Wed, 03 Jan 2007)
New Revision: 8914

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/debian/postinst
   projects/haf/trunk/osso-af-startup/services/after-suw-process-restart.sh
Log:
fixing startup problem in Sardine


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2007-01-03 07:43:42 UTC (rev 8913)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2007-01-03 07:56:32 UTC (rev 8914)
@@ -1,3 +1,11 @@
+osso-af-startup (1.33-1) unstable; urgency=low
+
+  * UNRELEASED
+  * Fixed problem with /etc/sudoers when installing to Sardine.
+  * Fixed startup problem when alarmd is not available. Fixes: MB#910
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 03 Jan 2007 09:49:17 +0200
+
 osso-af-startup (1.32-1) unstable; urgency=low
 
   * Added new startup greeting. Fixes: NB#47055

Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2007-01-03 07:43:42 UTC (rev 8913)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2007-01-03 07:56:32 UTC (rev 8914)
@@ -4,8 +4,10 @@
 {
   line="$1"
   if ! grep -F -q "$line" /etc/sudoers; then
+    chmod 666 /etc/sudoers
     echo "+$line"
     echo "$line" >>/etc/sudoers
+    chmod 440 /etc/sudoers
   fi
 }
 

Modified: projects/haf/trunk/osso-af-startup/services/after-suw-process-restart.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/after-suw-process-restart.sh	2007-01-03 07:43:42 UTC (rev 8913)
+++ projects/haf/trunk/osso-af-startup/services/after-suw-process-restart.sh	2007-01-03 07:56:32 UTC (rev 8914)
@@ -2,7 +2,7 @@
 #
 # This file is part of osso-af-startup.
 #
-# Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
+# Copyright (C) 2004-2007 Nokia Corporation. All rights reserved.
 #
 # Contact: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 #
@@ -22,7 +22,9 @@
 
 DIR=$AF_INIT_DIR
 
-sudo /etc/init.d/alarmd stop
+if [ -x /etc/init.d/alarmd ]; then
+  sudo /etc/init.d/alarmd stop
+fi
 if [ -x $DIR/osso-media-server.sh ]; then
   $DIR/osso-media-server.sh stop
 fi
@@ -31,7 +33,9 @@
   source $DIR/keyboard.defs
 fi
 source $DIR/keyboard.sh stop
-sudo /etc/init.d/ke-recv stop
+if [ -x /etc/init.d/ke-recv ]; then
+  sudo /etc/init.d/ke-recv stop
+fi
 source $DIR/dbus-sessionbus.sh stop
 
 # wait for the D-BUS session bus to die
@@ -50,8 +54,12 @@
 if [ -x /etc/init.d/maemo-launcher ]; then
   /etc/init.d/maemo-launcher restart
 fi
-sudo /etc/init.d/ke-recv start
-sudo /etc/init.d/osso-systemui restart
+if [ -x /etc/init.d/ke-recv ]; then
+  sudo /etc/init.d/ke-recv start
+fi
+if [ -x /etc/init.d/osso-systemui ]; then
+  sudo /etc/init.d/osso-systemui restart
+fi
 if [ -x $DIR/osso-media-server.sh ]; then
   $DIR/osso-media-server.sh start &
 fi
@@ -59,6 +67,8 @@
   source $DIR/osso-connectivity-ui.sh start
 fi
 source $DIR/keyboard.sh start
-sudo /etc/init.d/alarmd start
+if [ -x /etc/init.d/alarmd ]; then
+  sudo /etc/init.d/alarmd start
+fi
 # give VKB some time to start
 sleep 3