8 files changed, 16 insertions, 6 deletions
diff --git a/packages/busybox/busybox-static_1.11.3.bb b/packages/busybox/busybox-static_1.11.3.bb
index 9313c892f6..cf82921e9b 100644
--- a/packages/busybox/busybox-static_1.11.3.bb
+++ b/packages/busybox/busybox-static_1.11.3.bb
@@ -1,4 +1,4 @@
 require busybox_${PV}.bb
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/busybox-1.11.3"
diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc
index 4b195d5584..cb8eb53216 100644
--- a/packages/busybox/busybox.inc
+++ b/packages/busybox/busybox.inc
@@ -129,6 +129,10 @@ do_install () {
 		install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
 		install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
 	fi
+	if grep "CONFIG_FEATURE_MOUNT_FSTAB=y" ${WORKDIR}/defconfig; then
+		install -d ${D}${sysconfdir}/default
+		install -m 644 ${WORKDIR}/mountall ${D}${sysconfdir}/default/
+	fi
 
 	install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
 }
diff --git a/packages/busybox/busybox_1.11.3.bb b/packages/busybox/busybox_1.11.3.bb
index b42f8ea998..305a0b6c14 100644
--- a/packages/busybox/busybox_1.11.3.bb
+++ b/packages/busybox/busybox_1.11.3.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
@@ -13,6 +13,7 @@ SRC_URI = "\
   file://default.script \
   file://hwclock.sh \
   file://mount.busybox \
+  file://mountall \
   file://syslog \
   file://syslog.conf \
   file://umount.busybox \
diff --git a/packages/busybox/busybox_1.13.2.bb b/packages/busybox/busybox_1.13.2.bb
index f00830badb..cafcf98a52 100644
--- a/packages/busybox/busybox_1.13.2.bb
+++ b/packages/busybox/busybox_1.13.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
@@ -20,6 +20,7 @@ SRC_URI = "\
   file://default.script \
   file://hwclock.sh \
   file://mount.busybox \
+  file://mountall \
   file://syslog \
   file://syslog.conf \
   file://umount.busybox \
diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb
index e98e25eb37..9d6e01c3d0 100644
--- a/packages/busybox/busybox_1.7.2.bb
+++ b/packages/busybox/busybox_1.7.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://busybox-cron \
@@ -8,6 +8,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://default.script \
            file://hwclock.sh \
            file://mount.busybox \
+           file://mountall \
            file://syslog \
            file://syslog.conf \
            file://udhcpscript.patch;patch=1 \
diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb
index 77dd2a905c..eb8d37286f 100644
--- a/packages/busybox/busybox_1.9.2.bb
+++ b/packages/busybox/busybox_1.9.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://udhcpscript.patch;patch=1 \
@@ -12,6 +12,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://default.script \
            file://hwclock.sh \
            file://mount.busybox \
+           file://mountall \
            file://syslog \
            file://syslog.conf \
            file://umount.busybox \
diff --git a/packages/busybox/files/mountall b/packages/busybox/files/mountall
new file mode 100644
index 0000000000..d5408b8f8d
--- /dev/null
+++ b/packages/busybox/files/mountall
@@ -0,0 +1 @@
+MOUNTALL="-t nonfs,nosmbfs,noncpfs"
diff --git a/packages/busybox/slingbox_1.3.1.bb b/packages/busybox/slingbox_1.3.1.bb
index cbcce6c675..0a9051d447 100644
--- a/packages/busybox/slingbox_1.3.1.bb
+++ b/packages/busybox/slingbox_1.3.1.bb
@@ -4,11 +4,12 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r3"
+PR = "r4"
 COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
+           file://mountall \
            file://shadow_h_is_required.patch;patch=1 \
            file://df_rootfs.patch;patch=1 \
            file://lazy_umount.patch;patch=1 \