[oe-commits] org.oe.dev SlugOS 5.0 - slugos-init: update to make nfs boot work correctly; cleanup

[mwester commit]

SlugOS 5.0 - slugos-init: update to make nfs boot work correctly; cleanup
of kexec stuff (although kexec won't work with the current kernel yet).

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: a7b7d4700cc3ecf7ecb70b8c6056d4e2dd721550
ViewMTN: http://monotone.openembedded.org/revision/info/a7b7d4700cc3ecf7ecb70b8c6056d4e2dd721550
Files:
1
packages/slugos-init/files/boot/kexec
packages/slugos-init/files/boot/network
packages/slugos-init/slugos-init_5.0.bb
Diffs:

#
# mt diff -rf4dabead7ddd765bb651fb44cd9e5d48fb582330 -ra7b7d4700cc3ecf7ecb70b8c6056d4e2dd721550
#
#
#
# patch "packages/slugos-init/files/boot/kexec"
#  from [c24e253fa7a0417e61f46145915f5a38d088dc42]
#    to [6b3c4cc871eb7111261969670e39d147f3f80400]
# 
# patch "packages/slugos-init/files/boot/network"
#  from [24a86887b19822c0276b0b4206959bddae2cd3c3]
#    to [024d9620d5f3fde3cd9a2305b0d0d86bb6409081]
# 
# patch "packages/slugos-init/slugos-init_5.0.bb"
#  from [5c3b2fe18a30d3510095f7868b4e32f248080492]
#    to [9a455a4cc8bd81f72ac4bedd0d75467081204750]
#
============================================================
--- packages/slugos-init/files/boot/kexec	c24e253fa7a0417e61f46145915f5a38d088dc42
+++ packages/slugos-init/files/boot/kexec	6b3c4cc871eb7111261969670e39d147f3f80400
@@ -91,7 +91,6 @@ if [ -n "$1" -a -n "$2" ] ; then
 			t=`basename "$kpath"`
 			kexec_image="/mnt/$t"
 		    fi
-		    umount /sys
 		fi
 		;;
 
@@ -105,7 +104,6 @@ if [ -n "$1" -a -n "$2" ] ; then
 			t=`basename "$kpath"`
 			kexec_image="/mnt/$t"
 		    fi
-		    umount /sys
 		fi
 		;;
 
@@ -143,7 +141,6 @@ if [ -n "$1" -a -n "$2" ] ; then
 			echo "Loading kexec kernel using tftp \"$kpath\"..."
 			tftp -g -l "$kexec_image" -r "${kpath#*:}" "${kpath%%:*}"
 		    fi
-		    umount /sys
 		fi
 		;;
 
============================================================
--- packages/slugos-init/files/boot/network	24a86887b19822c0276b0b4206959bddae2cd3c3
+++ packages/slugos-init/files/boot/network	024d9620d5f3fde3cd9a2305b0d0d86bb6409081
@@ -24,8 +24,12 @@ test -z "$iface" && exit 1 
 iface="$(config iface)"
 test -z "$iface" && exit 1 
 #
-# Fire up a process in the background to load the firmware if necessary
-sysf="/sys/class/firmware/firmware-$iface"
+# Fire up a process in the background to load the firmware if necessary.
+# If this system doesn't require the NPE-B firmware, no problem, the
+# background process will simply go away in two seconds.  If it requires
+# some other firmware, then modification will be required.  We probably
+# should replace this with mdev or some other hotplug-based technique...
+sysf="/sys/class/firmware/$iface"
 (
 	# Wait for the firware to be requested, if required
 	[ -f $sysf/loading ] || sleep 1
@@ -39,5 +43,9 @@ ifconfig "$iface" up
 # Trigger the firmware load proactively
 ifconfig "$iface" up
 #
+# Unmount /sys and /proc before we leave
+umount /sys
+umount /proc
+#
 ifup "$iface"
 # exit code is true only if the interface config has succeeded
============================================================
--- packages/slugos-init/slugos-init_5.0.bb	5c3b2fe18a30d3510095f7868b4e32f248080492
+++ packages/slugos-init/slugos-init_5.0.bb	9a455a4cc8bd81f72ac4bedd0d75467081204750
@@ -4,7 +4,7 @@ RDEPENDS = "busybox devio"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r1"
+PR = "r1.2"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \