mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-16 15:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

busybox: fail on no media

Browse Source 
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.

(From OE-Core rev: e5403f55a1e9b1747535450fd95f499c85211771)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold
2013-04-09 23:25:54 -07:00
committed by Richard Purdie
parent 2435d807d1
commit ecd90bc6aa
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
meta/recipes-core/busybox/busybox-1.20.2/fail_on_no_media.patch Normal file
View File

@@ -0,0 +1,31 @@
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 || errno == ENODEV)) {
+ 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))

3
meta/recipes-core/busybox/busybox_1.20.2.bb
View File

@@ -31,7 +31,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://busybox-syslog.service.in \
file://busybox-klogd.service.in \
file://testsuite-du-du-k-works-fix-false-positive.patch \
file://strict-atime.patch"
file://strict-atime.patch \
file://fail_on_no_media.patch"
SRC_URI[tarball.md5sum] = "e025414bc6cd79579cc7a32a45d3ae1c"
SRC_URI[tarball.sha256sum] = "eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882"