summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2019-01-06 18:36:42 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2019-01-06 18:49:34 +0000
commitbef9859a73a32631c14f336f6a40e079a8ee1948 (patch)
treea55b9d58a511319c366c4b5d523577c400425e0e
parentae1ba0befc8d0a7af19e07472ecf0d3b23db1ed3 (diff)
downloaddrakx-bef9859a73a32631c14f336f6a40e079a8ee1948.tar
drakx-bef9859a73a32631c14f336f6a40e079a8ee1948.tar.gz
drakx-bef9859a73a32631c14f336f6a40e079a8ee1948.tar.bz2
drakx-bef9859a73a32631c14f336f6a40e079a8ee1948.tar.xz
drakx-bef9859a73a32631c14f336f6a40e079a8ee1948.zip
Suppress mount error messages when probing for media (mga#24142)
Probably caused by the switch to using the standalone mount command, the tail end of a mount error message was left showing in the GUI.
-rw-r--r--mdk-stage1/NEWS1
-rw-r--r--mdk-stage1/mount.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index cf1cee68e..074673245 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,4 @@
+- suppress mount error messages when probing for media (mga#24142)
- better gcc8 workarounds
2.35
diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c
index 4ff1f5ffa..2920ff77c 100644
--- a/mdk-stage1/mount.c
+++ b/mdk-stage1/mount.c
@@ -131,7 +131,7 @@ int my_mount(char *dev, char *location, char *fs, int force_rw)
#endif
char *cmd;
- rc = asprintf(&cmd, "mount %s %s -t %s -o %s%s", dev, location, fs, (force_rw ? "" : "ro,"), (opts ? opts : ""));
+ rc = asprintf(&cmd, "mount %s %s -t %s -o %s%s > /dev/null 2>&1", dev, location, fs, (force_rw ? "" : "ro,"), (opts ? opts : ""));
if (rc == -1) {
log_perror("asprint allocation failure");
rmdir(location);