[oe-commits] org.oe.dev SlugOS: make "turnup nfs" work correctly with the new network driver (loads

[mwester commit]

SlugOS: make "turnup nfs" work correctly with the new network driver (loads
firmware, and ensures we do not ifup the interface if the rootfs in nfs).

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: 7787114b2180be3c68b345096ba1efb73b3e8371
ViewMTN: http://monotone.openembedded.org/revision/info/7787114b2180be3c68b345096ba1efb73b3e8371
Files:
1
packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot
packages/netbase/netbase_4.21.bb
packages/slugos-init/files/boot/network
packages/slugos-init/slugos-init_4.8.bb
Diffs:

#
# mt diff -raf290d94e260037595c3cc0686345dfc706a4fab -r7787114b2180be3c68b345096ba1efb73b3e8371
#
# 
# 
# add_file "packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot"
#  content [225fbcdfa332608a2c8f1360fc922261f28ba694]
# 
# patch "packages/netbase/netbase_4.21.bb"
#  from [af669d9b9d58a59681b0445de61ca6198bb991e1]
#    to [e8599c2f3bf24aaaf6db4afc8fb1f79a74ba059b]
# 
# patch "packages/slugos-init/files/boot/network"
#  from [4fe9fe097faa17da41a09d209399c67df115768c]
#    to [24a86887b19822c0276b0b4206959bddae2cd3c3]
# 
# patch "packages/slugos-init/slugos-init_4.8.bb"
#  from [5c3b2fe18a30d3510095f7868b4e32f248080492]
#    to [f1d83bb6efd47859e2fa618a8f46c7956a5305a5]
# 
============================================================
--- packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot	225fbcdfa332608a2c8f1360fc922261f28ba694
+++ packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot	225fbcdfa332608a2c8f1360fc922261f28ba694
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+if [ X"$IFACE" == "Xeth0" ] ; then
+  nfsroot=`grep ' / nfs ' /proc/mounts`
+  if [ -n "$nfsroot" ]; then
+    echo "WARNING: Refusing to ifup eth0 when booted to a nfs-mounted rootfs."
+    exit 1
+  fi
+fi
+exit 0
============================================================
--- packages/netbase/netbase_4.21.bb	af669d9b9d58a59681b0445de61ca6198bb991e1
+++ packages/netbase/netbase_4.21.bb	e8599c2f3bf24aaaf6db4afc8fb1f79a74ba059b
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r26"
+PR = "r27"
 
 inherit update-rc.d
 
============================================================
--- packages/slugos-init/files/boot/network	4fe9fe097faa17da41a09d209399c67df115768c
+++ packages/slugos-init/files/boot/network	24a86887b19822c0276b0b4206959bddae2cd3c3
@@ -25,7 +25,7 @@ test -z "$iface" && exit 1 
 test -z "$iface" && exit 1 
 #
 # Fire up a process in the background to load the firmware if necessary
-sysf="/sys/class/firmware/$iface"
+sysf="/sys/class/firmware/firmware-$iface"
 (
 	# Wait for the firware to be requested, if required
 	[ -f $sysf/loading ] || sleep 1
============================================================
--- packages/slugos-init/slugos-init_4.8.bb	5c3b2fe18a30d3510095f7868b4e32f248080492
+++ packages/slugos-init/slugos-init_4.8.bb	f1d83bb6efd47859e2fa618a8f46c7956a5305a5
@@ -1,10 +1,10 @@ RDEPENDS = "busybox devio"
 DESCRIPTION = "SlugOS initial network config via sysconf"
 SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \