initscripts 1.0: mountall.sh: Drop dependency on util-linux-mount.

* Yes, there's such dependency, unspecified. Due to funky options it
doesn't work with cute busybox mount.
* Those funky options better be killed shamefully, but let's do the
twist, and allow to specify additional mountall options via
/etc/default/mountall, and let util-linix-mount spit its funkiness
there. User can edit it to his likes, too.

diff --git a/packages/initscripts/initscripts-1.0/mountall.sh b/packages/initscripts/initscripts-1.0/mountall.sh
index 65d5d26..30f5b5e 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/mountall.sh
+++ b/packages/initscripts/initscripts-1.0/mountall.sh
@@ -4,6 +4,9 @@
 # Version:     @(#)mountall.sh  2.83-2  01-Nov-2001  miquels@cistron.nl
 #
 . /etc/default/rcS
+if test -f /etc/default/mountall; then
+    . /etc/default/mountall
+fi
 
 #
 # Mount local filesystems in /etc/fstab. For some reason, people
@@ -11,7 +14,7 @@
 # about this. So we mount "proc" filesystems without -v.
 #
 test "$VERBOSE" != no && echo "Mounting local filesystems..."
-mount -at nonfs,nosmbfs,noncpfs 2>/dev/null
+mount -a $MOUNTALL 2>/dev/null
 
 #
 # We might have mounted something over /dev, see if /dev/initctl is there.

diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index c390968..1203fb4 100644 (file)
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r94"
+PR = "r95"
 
 SRC_URI = "file://halt \
            file://ramdisk \

diff --git a/packages/util-linux/util-linux.inc b/packages/util-linux/util-linux.inc
index a5ff009..2b52767 100644 (file)
--- a/packages/util-linux/util-linux.inc
+++ b/packages/util-linux/util-linux.inc
@@ -23,7 +23,7 @@ FILES_util-linux-cfdisk = "/sbin/cfdisk"
 FILES_util-linux-sfdisk = "/sbin/sfdisk"
 FILES_util-linux-swaponoff = "/sbin/swapon.${PN} /sbin/swapoff.${PN}"
 FILES_util-linux-losetup = "/sbin/losetup.${PN}"
-FILES_util-linux-mount = "/bin/mount.${PN}"
+FILES_util-linux-mount = "/bin/mount.${PN} ${sysconfdir}/default/mountall"
 FILES_util-linux-umount = "/bin/umount.${PN}"
 FILES_util-linux-readprofile = "/usr/sbin/readprofile"
 
@@ -95,6 +95,8 @@ do_install () {
        mv ${D}${base_bindir}/umount ${D}${base_bindir}/umount.${PN}
        mv ${D}${base_bindir}/mount ${D}${base_bindir}/mount.${PN}
        mv ${D}${base_sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN}
+       install -d ${D}${sysconfdir}/default/
+       echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
 
        checklink swapon ${D}${base_sbindir}/swapoff ".${PN}"
        checklink shutdown ${D}${base_sbindir}/reboot ".${PN}"

diff --git a/packages/util-linux/util-linux_2.12r.bb b/packages/util-linux/util-linux_2.12r.bb
index 0409f61..9d4b59c 100644 (file)
--- a/packages/util-linux/util-linux_2.12r.bb
+++ b/packages/util-linux/util-linux_2.12r.bb
@@ -4,4 +4,4 @@ SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1"
 SRC_URI += "file://glibc-fix.patch;patch=1"
 SRC_URI += "file://glibc-umount2.patch;patch=1"
 
-PR = "r11"
+PR = "r12"