131e5e7e8f
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>
32 lines
1 KiB
Diff
32 lines
1 KiB
Diff
Upstream-Status: Pending
|
|
|
|
The current behaviour of busybox is to try all fstype when automounting
|
|
even when no media exists. The util-linux mount command bails when no
|
|
media exists, so change the behaviour of busybox to do the same.
|
|
|
|
It could also be argued that the KERN_INFO message from btrfs could be
|
|
removed, but that would be harder to accomplish.
|
|
|
|
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
|
|
|
|
|
Index: busybox-1.20.2/util-linux/mount.c
|
|
===================================================================
|
|
--- busybox-1.20.2.orig/util-linux/mount.c
|
|
+++ busybox-1.20.2/util-linux/mount.c
|
|
@@ -598,7 +598,13 @@ static int mount_it_now(struct mntent *m
|
|
break;
|
|
errno = errno_save;
|
|
}
|
|
-
|
|
+ /*
|
|
+ * Break if there is no media, no point retrying for all
|
|
+ * fs types since there is no media available
|
|
+ */
|
|
+ if (rc == -1 && errno == ENOMEDIUM) {
|
|
+ bb_perror_msg_and_die("mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir);
|
|
+ }
|
|
if (!rc || (vfsflags & MS_RDONLY) || (errno != EACCES && errno != EROFS))
|
|
break;
|
|
if (!(vfsflags & MS_SILENT))
|