[meego-commits] 15152: Changes to Trunk:Testing/fastinit

[Markus Lehtonen]

Hi,
I have made the following changes to fastinit in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Markus Lehtonen

[This message was auto-generated]

---

Request #15152:

  submit:   home:mlehtonen:branches:Trunk:Testing/fastinit(r2)(cleanup) -> Trunk:Testing/fastinit


Message:
    * Thu Mar 24 2011 Markus Lehtonen <markus.lehtonen at nokia.com> - 1.28
- Fix DSME startup script (BMC#13917)

State:   new          2011-03-24T02:10:05 mlehtonen
Comment: None



changes files:
--------------
--- fastinit.changes
+++ fastinit.changes
@@ -0,0 +1,3 @@
+* Thu Mar 24 2011 Markus Lehtonen <markus.lehtonen at nokia.com> - 1.28
+- Fix DSME startup script (BMC#13917)
+

spec files:
-----------

other changes:
--------------

++++++ add-daemon.patch
--- add-daemon.patch
+++ add-daemon.patch
@@ -1,46 +1,20 @@
-diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
-index d45f50d..0968769 100755
---- a/rc.d/rc.sysinit
-+++ b/rc.d/rc.sysinit
-@@ -245,6 +245,37 @@ chown root:root /tmp/.ICE-unix
+Index: fastinit-1.28/rc.d/rc.sysinit
+===================================================================
+--- fastinit-1.28.orig/rc.d/rc.sysinit	2011-02-14 20:01:26.000000000 +0200
++++ fastinit-1.28/rc.d/rc.sysinit	2011-03-24 10:54:04.560623516 +0200
+@@ -245,6 +245,11 @@
  	chgrp utmp /var/run/utmp{,x} /var/log/wtmp{,x}
  	chmod 0664 /var/run/utmp{,x} /var/log/wtmp{,x}
  
 +	if [ -x "/usr/sbin/dsme" ] ; then
-+		# Get boot state
-+		GETBOOTSTATE=/sbin/getbootstate
-+		if [ -x $GETBOOTSTATE ]; then
-+			export BOOTSTATE=`getbootstate 2>/dev/null`
-+		else
-+			# A reasonable default to prevent reboot/shutdown
-+			export BOOTSTATE="USER"
-+		fi
-+
-+		touch /tmp/$BOOTSTATE
-+		echo $BOOTSTATE > /tmp/STATE
-+
-+		if [ -x /etc/resource_limits.conf ]; then
-+			source /etc/resource_limits.conf
-+		fi
-+
-+		# Get R&D flags
-+		CALTOOL=/usr/bin/cal-tool
-+		RDMODE_CONF_FILE=/etc/dsme/rdmode
-+		if [ -x $CALTOOL ]; then
-+			$CALTOOL --get-rd-mode | grep -q enabled \
-+			&& export DSME_RD_FLAGS=`$CALTOOL --get-rd-flags`
-+		elif [ -f $RDMODE_CONF_FILE ]; then
-+			export DSME_RD_FLAGS=`cat $RDMODE_CONF_FILE`
-+		fi
-+
-+		echo -n "Starting DSME in state '$BOOTSTATE': "
-+                /usr/sbin/dsme -p /usr/lib/dsme/libstartup.so &> /dev/null &
++		export BOOTSTATE="USER"
++		/usr/sbin/dsme -p /usr/lib/dsme/libstartup.so &>/dev/null &
 +	fi
 +
  	# wait for dbus to start accepting connections
  	while ! dbus-send --system --reply-timeout=10 --dest=org.freedesktop.DBus /org/freedesktop/DBus/GetId org.freedesktop.DBus.GetId ; do : ; done
  	# now we can start hal (yes, this is a hal/dbus bug)
-@@ -337,7 +368,24 @@ chown root:root /tmp/.ICE-unix
+@@ -337,7 +342,24 @@
  	if [ -x "/sbin/console_init" ] ; then
  		/sbin/console_init /dev/tty0
  	fi