diff options
| author | Mike Westerhof <mwester@dls.net> | 2008-02-10 01:55:22 +0000 |
|---|---|---|
| committer | Mike Westerhof <mwester@dls.net> | 2008-02-10 01:55:22 +0000 |
| commit | c066f95098df28fdd517dee575326d6aa6f5417f (patch) | |
| tree | 68e88c85ee04fc95583ed1a208ab172ab6be5fc7 | |
| parent | ce51a7c1cdf92c7848ef5bca186d794bcaeba0bd (diff) | |
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).
| -rw-r--r-- | packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot | 10 | ||||
| -rw-r--r-- | packages/netbase/netbase_4.21.bb | 2 | ||||
| -rw-r--r-- | packages/slugos-init/files/boot/network | 2 | ||||
| -rw-r--r-- | packages/slugos-init/slugos-init_4.8.bb | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot b/packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot new file mode 100644 index 0000000000..bbfd7d9bb3 --- /dev/null +++ b/packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot @@ -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 diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index 1f2837a8c1..73e765376c 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ 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 diff --git a/packages/slugos-init/files/boot/network b/packages/slugos-init/files/boot/network index 8c0635d3ac..8124f19ab2 100644 --- a/packages/slugos-init/files/boot/network +++ b/packages/slugos-init/files/boot/network @@ -25,7 +25,7 @@ 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/$iface" +sysf="/sys/class/firmware/firmware-$iface" ( # Wait for the firware to be requested, if required [ -f $sysf/loading ] || sleep 1 diff --git a/packages/slugos-init/slugos-init_4.8.bb b/packages/slugos-init/slugos-init_4.8.bb index 92ac7e30f3..4babf89d61 100644 --- a/packages/slugos-init/slugos-init_4.8.bb +++ b/packages/slugos-init/slugos-init_4.8.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r1" +PR = "r2" SRC_URI = "file://boot/flash \ file://boot/disk \ |