From cf5ff7ac996ec24b5c26c90e20f3489d295fb590 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 23 Jun 2007 20:56:44 +0000 Subject: 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. --- packages/util-linux/util-linux.inc | 4 +++- packages/util-linux/util-linux_2.12r.bb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'packages/util-linux') diff --git a/packages/util-linux/util-linux.inc b/packages/util-linux/util-linux.inc index a5ff009669..2b527678c4 100644 --- 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 0409f61b74..9d4b59c855 100644 --- 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" -- cgit v1.2.3