diff options
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.19.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/busybox/files/simple.script | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb index cc97e2a853..7bdfbda538 100644 --- a/meta/recipes-core/busybox/busybox_1.19.4.bb +++ b/meta/recipes-core/busybox/busybox_1.19.4.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require busybox.inc | 1 | require busybox.inc |
2 | PR = "r10" | 2 | PR = "r11" |
3 | 3 | ||
4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | 4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ |
5 | file://B921600.patch \ | 5 | file://B921600.patch \ |
diff --git a/meta/recipes-core/busybox/files/simple.script b/meta/recipes-core/busybox/files/simple.script index 27368f0ee5..69739850d8 100644 --- a/meta/recipes-core/busybox/files/simple.script +++ b/meta/recipes-core/busybox/files/simple.script | |||
@@ -10,7 +10,8 @@ RESOLV_CONF="/etc/resolv.conf" | |||
10 | 10 | ||
11 | # return 0 if root is mounted on a network filesystem | 11 | # return 0 if root is mounted on a network filesystem |
12 | root_is_nfs() { | 12 | root_is_nfs() { |
13 | grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts | 13 | sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\1 \2/p' /proc/mounts | |
14 | grep -q "^/ \(nfs\|smbfs\|ncp\|coda\)$" | ||
14 | } | 15 | } |
15 | 16 | ||
16 | have_bin_ip=0 | 17 | have_bin_ip=0 |