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

[Ulf Hofemeier]

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

Thank You,
Ulf Hofemeier

[This message was auto-generated]

---

Request #15541:

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


Message:
    revert to 3

State:   new          2011-03-31T09:13:59 ulf
Comment: None



changes files:
--------------
--- fastinit.changes
+++ fastinit.changes
@@ -1,4 +0,0 @@
-* Thu Mar 31 2011 Markus Lehtonen <markus.lehtonen at nokia.com> - 1.28
-- Sensorfw: support for a device-specific .modules file to load required
-  kernel modules before sensord starts. Needed to fix BMC#11699
-

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

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

++++++ sensorfw-boardname.patch
--- sensorfw-boardname.patch
+++ sensorfw-boardname.patch
@@ -1,8 +1,8 @@
 Index: fastinit-1.28/rc.d/rc.sysinit
 ===================================================================
---- fastinit-1.28.orig/rc.d/rc.sysinit	2011-03-31 14:00:28.447688501 +0300
-+++ fastinit-1.28/rc.d/rc.sysinit	2011-03-31 15:35:33.768469371 +0300
-@@ -348,9 +348,33 @@
+--- fastinit-1.28.orig/rc.d/rc.sysinit	2011-03-01 16:52:13.537460602 +0200
++++ fastinit-1.28/rc.d/rc.sysinit	2011-03-01 16:54:18.389897739 +0200
+@@ -374,9 +374,23 @@
  	fi
  
  	if [ -x "/usr/sbin/sensord" ] ; then
@@ -17,20 +17,10 @@
 +				grep -q $fbase /etc/boardname
 +				if [ $? -eq 0 ]; then
 +					sensordconfig="-c=$f"
-+					# Accompanying modules file (just replace the 'conf' suffix
-+					# with 'modules')
-+					sensordmodulesfile=`echo "$f" | sed s/conf$/modules/`
 +					break
 +				fi
 +			done
 +		fi
-+		# Load also kernel modules listed in the .modules file (if found).
-+		# The file should just contain a list of modules, one module per line 
-+		if [ $sensordmodulesfile -a -f $sensordmodulesfile ]; then
-+			# Remove comment lines (starting with '#') and blank lines, then just call
-+			# modprobe for each line
-+			sed -e 's/[ \t]*#.*//' -e '/^$/ d' $sensordmodulesfile | xargs -L1  modprobe
-+		fi
 +		/usr/sbin/sensord $sensordconfig -d --log-target=4 --log-file-path=/var/log/sensord.log
  	fi
 -