summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-07-05 10:29:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-05 15:44:13 +0100
commit131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0 (patch)
treecde6580df91d24345c12bac7b171e2d0d35d8d17 /meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch
parent0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 (diff)
downloadpoky-131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0.tar.gz
busybox: upgrade to stable 1.21.1
Merged or backported patches are dropped. The wget_dl_dir_fix.patch was submitted more than 1 year ago, it's about the -P option behavior, and it's not accepted, so I dropped this patch too. (From OE-Core rev: a2f31a6a6accb8eee2084cb39edb8e9af4b4189f) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch')
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch b/meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch
new file mode 100644
index 0000000000..6745f169fe
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch
@@ -0,0 +1,31 @@
1Upstream-Status: Pending
2
3The current behaviour of busybox is to try all fstype when automounting
4even when no media exists. The util-linux mount command bails when no
5media exists, so change the behaviour of busybox to do the same.
6
7It could also be argued that the KERN_INFO message from btrfs could be
8removed, but that would be harder to accomplish.
9
10Signed-off-by: Saul Wold <sgw@linux.intel.com>
11
12
13Index: busybox-1.20.2/util-linux/mount.c
14===================================================================
15--- busybox-1.20.2.orig/util-linux/mount.c
16+++ busybox-1.20.2/util-linux/mount.c
17@@ -598,7 +598,13 @@ static int mount_it_now(struct mntent *m
18 break;
19 errno = errno_save;
20 }
21-
22+ /*
23+ * Break if there is no media, no point retrying for all
24+ * fs types since there is no media available
25+ */
26+ if (rc == -1 && errno == ENOMEDIUM) {
27+ bb_perror_msg_and_die("mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir);
28+ }
29 if (!rc || (vfsflags & MS_RDONLY) || (errno != EACCES && errno != EROFS))
30 break;
31 if (!(vfsflags & MS_SILENT))