From 33ab187f5a453290dc548ee3b41f1f78e8ef3268 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Mon, 22 Apr 2013 19:16:13 +0900 Subject: [PATCH] busybox: mount: don't pass option auto to kernel --- ...11-mount-don-t-pass-option-auto-to-kernel.patch | 38 ++++++++++++++++++++++ .../recipes-core/busybox/busybox_1.19.4.bbappend | 3 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0011-mount-don-t-pass-option-auto-to-kernel.patch diff --git a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0011-mount-don-t-pass-option-auto-to-kernel.patch b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0011-mount-don-t-pass-option-auto-to-kernel.patch new file mode 100644 index 0000000..b25d587 --- /dev/null +++ b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0011-mount-don-t-pass-option-auto-to-kernel.patch @@ -0,0 +1,38 @@ +From 7c462943dd3c283314e68e945d544dfbaaa4cb25 Mon Sep 17 00:00:00 2001 +From: Andreas Oberritter +Date: Mon, 22 Apr 2013 10:40:36 +0200 +Subject: [PATCH 11/11] mount: don't pass option "auto" to kernel + +Fixes the following error if "auto" is set in fs options: +| EXT3-fs (sda1): error: unrecognized mount option "auto" or missing value +| EXT4-fs (sda1): Unrecognized mount option "auto" or missing value +| XFS (sda1): unknown mount option [auto]. + +Signed-off-by: Andreas Oberritter +--- + util-linux/mount.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/util-linux/mount.c b/util-linux/mount.c +index 05e532c..670935d 100644 +--- a/util-linux/mount.c ++++ b/util-linux/mount.c +@@ -212,6 +212,7 @@ static const int32_t mount_options[] = { + IF_FEATURE_MOUNT_FSTAB( + /* "defaults" */ 0, + /* "quiet" 0 - do not filter out, vfat wants to see it */ ++ /* "auto" */ 0, + /* "noauto" */ MOUNT_NOAUTO, + /* "sw" */ MOUNT_SWAP, + /* "swap" */ MOUNT_SWAP, +@@ -269,6 +270,7 @@ static const char mount_option_str[] = + IF_FEATURE_MOUNT_FSTAB( + "defaults\0" + // "quiet\0" - do not filter out, vfat wants to see it ++ "auto\0" + "noauto\0" + "sw\0" + "swap\0" +-- +1.7.10.4 + diff --git a/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend b/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend index c061202..aff6f57 100644 --- a/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend +++ b/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend @@ -1,4 +1,4 @@ -PR .= "-vuplus9" +PR .= "-vuplus10" SRC_URI += " \ file://0001-ifupdown-support-post-up-pre-down-hooks.patch \ @@ -10,6 +10,7 @@ SRC_URI += " \ file://0007-ifplugd-move-read_pid-to-libbb-pidfile.c-and-rename-.patch \ file://0009-udhcpc-calculate-broadcast-address-if-not-given-by-s.patch \ file://0010-udhcpc-obtain-hostname-from-OS-by-default.patch \ + file://0011-mount-don-t-pass-option-auto-to-kernel.patch \ file://0001-work-around-linux-ext2_fs.h-breakage.patch \ file://0002-Create-and-use-our-own-copy-of-linux-ext2_fs.h.patch \ file://0003-Drop-include-bb_linux_ext2_fs.h-use-existing-e2fspro.patch \ -- 2.7.4