[meego-commits] 14392: Changes to Trunk/fastinit

[Peter Zhu]

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

Thank You,
Peter Zhu

[This message was auto-generated]

---

Request #14392:

  submit:   Trunk:Testing/fastinit(r3) -> Trunk/fastinit


Message:
    Move to Trunk

State:   new          2011-02-28T23:54:12 peter
Comment: None



changes files:
--------------
--- fastinit.changes
+++ fastinit.changes
@@ -0,0 +1,6 @@
+* Thu Feb 24 2011 Markus Lehtonen <markus.lehtonen at nokia.com> - 1.28
+- Modify add-daemon patch to start DSME much earlier (BMC#13716)
+- Start dsme, sensord and mce as daemons (part of BMC#12898) so that they
+  don't block the execution of the rc.sysinit script. DSME --daemon
+  option seems to be broken, thus using '&' for now.
+

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

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

++++++ add-daemon.patch
--- add-daemon.patch
+++ add-daemon.patch
@@ -1,28 +1,11 @@
-diff -urN fastinit-1.27/rc.d/rc.sysinit fastinit-1.27-new/rc.d/rc.sysinit
---- fastinit-1.27/rc.d/rc.sysinit	2010-12-07 02:58:09.000000000 +0800
-+++ fastinit-1.27-new/rc.d/rc.sysinit	2011-01-27 01:33:59.708811492 +0800
-@@ -335,6 +335,54 @@
- 	if [ -x "/sbin/console_init" ] ; then
- 		/sbin/console_init /dev/tty0
- 	fi
-+	
-+	if [ -x "/usr/sbin/ohmd" ] ; then
-+		/usr/sbin/ohmd
-+	fi
-+
-+	if [ -x "/usr/sbin/sensord" ] ; then
-+		/usr/sbin/sensord
-+	fi
-+	
-+	if [ -x "/sbin/mce" ] ; then
-+		test -d /var/run/mce || (rm -f /var/run/mce; mkdir /var/run/mce)
-+		/sbin/mce --force-syslog
-+	fi
-+	
-+	if [ -x "/usr/bin/timed" ] ; then
-+		/usr/bin/timed &
-+	fi
-+	
+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
+ 	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
@@ -51,8 +34,34 @@
 +		fi
 +
 +		echo -n "Starting DSME in state '$BOOTSTATE': "
-+                /usr/sbin/dsme -p /usr/lib/dsme/libstartup.so &> /dev/null
++                /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
+ 	if [ -x "/sbin/console_init" ] ; then
+ 		/sbin/console_init /dev/tty0
+ 	fi
++	
++	if [ -x "/usr/sbin/ohmd" ] ; then
++		/usr/sbin/ohmd
 +	fi
  
++	if [ -x "/usr/sbin/sensord" ] ; then
++		/usr/sbin/sensord -d
++	fi
++	
++	if [ -x "/sbin/mce" ] ; then
++		test -d /var/run/mce || (rm -f /var/run/mce; mkdir /var/run/mce)
++		/sbin/mce -d --force-syslog
++	fi
++	
++	if [ -x "/usr/bin/timed" ] ; then
++		/usr/bin/timed &
++	fi
++	
  	# enable SATA ALPM at the end of the disk sensitive part of the boot process
  	sleep 5
+ 	for lpm in /sys/class/scsi_host/host*/link_power_management_policy; do