+++ /dev/null
-From ceb378209f953ea745ed93a8645567196380ce3c Mon Sep 17 00:00:00 2001
-From: Andrej Valek <andrej.valek@siemens.com>
-Date: Thu, 24 Jun 2021 19:13:22 +0200
-Subject: [PATCH] mktemp: add tmpdir option
-
-Make mktemp more compatible with coreutils.
-- add "--tmpdir" option
-- add long variants for "d,q,u" options
-
-Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2021-June/088932.html]
-
-Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
-Signed-off-by: Peter Marko <peter.marko@siemens.com>
----
- coreutils/mktemp.c | 26 ++++++++++++++++++--------
- 1 file changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/coreutils/mktemp.c b/coreutils/mktemp.c
-index 5393320a5..05c6d98c6 100644
---- a/coreutils/mktemp.c
-+++ b/coreutils/mktemp.c
-@@ -39,16 +39,17 @@
- //kbuild:lib-$(CONFIG_MKTEMP) += mktemp.o
-
- //usage:#define mktemp_trivial_usage
--//usage: "[-dt] [-p DIR] [TEMPLATE]"
-+//usage: "[-dt] [-p DIR, --tmpdir[=DIR]] [TEMPLATE]"
- //usage:#define mktemp_full_usage "\n\n"
- //usage: "Create a temporary file with name based on TEMPLATE and print its name.\n"
- //usage: "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n"
- //usage: "Without TEMPLATE, -t tmp.XXXXXX is assumed.\n"
--//usage: "\n -d Make directory, not file"
--//usage: "\n -q Fail silently on errors"
--//usage: "\n -t Prepend base directory name to TEMPLATE"
--//usage: "\n -p DIR Use DIR as a base directory (implies -t)"
--//usage: "\n -u Do not create anything; print a name"
-+//usage: "\n -d Make directory, not file"
-+//usage: "\n -q Fail silently on errors"
-+//usage: "\n -t Prepend base directory name to TEMPLATE"
-+//usage: "\n -p DIR, --tmpdir[=DIR] Use DIR as a base directory (implies -t)"
-+//usage: "\n For --tmpdir is a optional one."
-+//usage: "\n -u Do not create anything; print a name"
- //usage: "\n"
- //usage: "\nBase directory is: -p DIR, else $TMPDIR, else /tmp"
- //usage:
-@@ -72,13 +73,22 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
- OPT_t = 1 << 2,
- OPT_p = 1 << 3,
- OPT_u = 1 << 4,
-+ OPT_td = 1 << 5,
- };
-
- path = getenv("TMPDIR");
- if (!path || path[0] == '\0')
- path = "/tmp";
-
-- opts = getopt32(argv, "^" "dqtp:u" "\0" "?1"/*1 arg max*/, &path);
-+ opts = getopt32long(argv, "^"
-+ "dqtp:u\0"
-+ "?1" /* 1 arg max */,
-+ "directory\0" No_argument "d"
-+ "quiet\0" No_argument "q"
-+ "dry-run\0" No_argument "u"
-+ "tmpdir\0" Optional_argument "\xff"
-+ , &path, &path
-+ );
-
- chp = argv[optind];
- if (!chp) {
-@@ -95,7 +105,7 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
- goto error;
- }
- #endif
-- if (opts & (OPT_t|OPT_p))
-+ if (opts & (OPT_t|OPT_p|OPT_td))
- chp = concat_path_file(path, chp);
-
- if (opts & OPT_u) {
---
-2.11.0
-
+From a35e79002d36cca3c272ba5625aec86d6b7a38a8 Mon Sep 17 00:00:00 2001
+From: Saul Wold <sgw@linux.intel.com>
+Date: Tue, 9 Apr 2013 23:25:54 -0700
+Subject: [PATCH] busybox: fail on no media
+
Upstream-Status: Denied
[https://www.mail-archive.com/busybox@busybox.net/msg22354.html]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
+---
+ util-linux/mount.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
-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;
+diff --git a/util-linux/mount.c b/util-linux/mount.c
+index 4e65b6b..9d7a566 100644
+--- a/util-linux/mount.c
++++ b/util-linux/mount.c
+@@ -746,6 +746,14 @@ static int mount_it_now(struct mntent *mp, unsigned long vfsflags, char *filtero
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))
++
+ // Should we retry read-only mount?
+ if (vfsflags & MS_RDONLY)
+ break; // no, already was tried
