summaryrefslogtreecommitdiff
path: root/packages/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'packages/util-linux')
-rw-r--r--packages/util-linux/util-linux.inc4
-rw-r--r--packages/util-linux/util-linux_2.12r.bb2
2 files changed, 4 insertions, 2 deletions
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"