Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-core / busybox / busybox-1.22.1 / 0011-mount-don-t-pass-option-auto-to-kernel.patch
1 From 7c462943dd3c283314e68e945d544dfbaaa4cb25 Mon Sep 17 00:00:00 2001
2 From: Andreas Oberritter <obi@opendreambox.org>
3 Date: Mon, 22 Apr 2013 10:40:36 +0200
4 Subject: [PATCH 11/11] mount: don't pass option "auto" to kernel
5
6 Fixes the following error if "auto" is set in fs options:
7 | EXT3-fs (sda1): error: unrecognized mount option "auto" or missing value
8 | EXT4-fs (sda1): Unrecognized mount option "auto" or missing value
9 | XFS (sda1): unknown mount option [auto].
10
11 Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
12 ---
13  util-linux/mount.c |    2 ++
14  1 file changed, 2 insertions(+)
15
16 diff --git a/util-linux/mount.c b/util-linux/mount.c
17 index 05e532c..670935d 100644
18 --- a/util-linux/mount.c
19 +++ b/util-linux/mount.c
20 @@ -212,6 +212,7 @@ static const int32_t mount_options[] = {
21         IF_FEATURE_MOUNT_FSTAB(
22                 /* "defaults" */ 0,
23                 /* "quiet" 0 - do not filter out, vfat wants to see it */
24 +               /* "auto" */ 0,
25                 /* "noauto" */ MOUNT_NOAUTO,
26                 /* "sw"     */ MOUNT_SWAP,
27                 /* "swap"   */ MOUNT_SWAP,
28 @@ -269,6 +270,7 @@ static const char mount_option_str[] =
29         IF_FEATURE_MOUNT_FSTAB(
30                 "defaults\0"
31                 // "quiet\0" - do not filter out, vfat wants to see it
32 +               "auto\0"
33                 "noauto\0"
34                 "sw\0"
35                 "swap\0"
36 -- 
37 1.7.10.4
38