[oe-commits] org.oe.dev initscripts 1.0: mountall.sh: Drop dependency on util-linux-mount.

[pfalcon commit]

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.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 6e1b46d4398be3ff476900418b1e5d6473dc997b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6e1b46d4398be3ff476900418b1e5d6473dc997b
Files:
1
packages/initscripts/initscripts-1.0/mountall.sh
packages/initscripts/initscripts_1.0.bb
packages/util-linux/util-linux.inc
packages/util-linux/util-linux_2.12r.bb
Diffs:

#
# mt diff -rf0f36228e0efce9c251ba830603b54e72d39d404 -r6e1b46d4398be3ff476900418b1e5d6473dc997b
#
# 
# 
# patch "packages/initscripts/initscripts-1.0/mountall.sh"
#  from [29211fcb04749397e5ead868510403ce326702fc]
#    to [6fa1485d05f3996a00c6e53f26d609e2e809ebf0]
# 
# patch "packages/initscripts/initscripts_1.0.bb"
#  from [4c63ef69c0db9d16925152166514d1c34825a6cb]
#    to [3ddcd5acf13d89fb97eca3e2e5bbacd351f59e58]
# 
# patch "packages/util-linux/util-linux.inc"
#  from [1082c797febc736bf47e8e054e7557c188cf78d1]
#    to [652a840cbd39c51f899e92b2d0f35f92d96bdbc8]
# 
# patch "packages/util-linux/util-linux_2.12r.bb"
#  from [21793def7bcd5450f58381cac211e01a3f0b218b]
#    to [f6fbb55ffc20768be6397e3ce9d25b88de00f9a8]
# 
============================================================
--- packages/initscripts/initscripts-1.0/mountall.sh	29211fcb04749397e5ead868510403ce326702fc
+++ packages/initscripts/initscripts-1.0/mountall.sh	6fa1485d05f3996a00c6e53f26d609e2e809ebf0
@@ -1,9 +1,12 @@
 #
 # mountall.sh	Mount all filesystems.
 #
 # Version:	@(#)mountall.sh  2.83-2  01-Nov-2001  miquels at 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 @@ test "$VERBOSE" != no && echo "Mounting 
 # 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.
============================================================
--- packages/initscripts/initscripts_1.0.bb	4c63ef69c0db9d16925152166514d1c34825a6cb
+++ packages/initscripts/initscripts_1.0.bb	3ddcd5acf13d89fb97eca3e2e5bbacd351f59e58
@@ -1,10 +1,10 @@ LICENSE = "GPL"
 DESCRIPTION = "SysV init scripts"
 SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r94"
+PR = "r95"
 
 SRC_URI = "file://halt \
            file://ramdisk \
============================================================
--- packages/util-linux/util-linux.inc	1082c797febc736bf47e8e054e7557c188cf78d1
+++ packages/util-linux/util-linux.inc	652a840cbd39c51f899e92b2d0f35f92d96bdbc8
@@ -23,7 +23,7 @@ FILES_util-linux-losetup = "/sbin/losetu
 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}"
============================================================
--- packages/util-linux/util-linux_2.12r.bb	21793def7bcd5450f58381cac211e01a3f0b218b
+++ packages/util-linux/util-linux_2.12r.bb	f6fbb55ffc20768be6397e3ce9d25b88de00f9a8
@@ -1,7 +1,7 @@ SRC_URI += "file://glibc-umount2.patch;p
 require util-linux.inc
 
 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 = "r12"
-PR = "r11"