summaryrefslogtreecommitdiff
path: root/bubblewrap.c
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2020-05-18 21:20:43 +0000
committerColin Walters <walters@verbum.org>2020-05-18 21:20:43 +0000
commit765dd0e94f53eb8fe875e59b7b3548c109298c0e (patch)
tree096fc16f7acdf736082d3f5dd9544bb9e20cdd89 /bubblewrap.c
parent5feb64dc60c936a7f9e424df9478aae9b88ee48a (diff)
downloadbubblewrap-765dd0e94f53eb8fe875e59b7b3548c109298c0e.tar.gz
Add MS_SILENT to most mount() invocations
There's an effort to migrate Linux filesystems to handle the y2038 problem, which is great. However, recently a kernel change landed that emits a warning when mounting a filesystem that doesn't handle it, and this notably shows up even when *remounting* e.g. for a read-only bind mount: Using e.g. `rpm-ostree install cowsay` there's a spam of: ``` [ 189.529594] xfs filesystem being remounted at /sysroot supports timestamps until 2038 (0x7fffffff) ``` Now particularly when creating a our bind mounts, let's ask the kernel to be quiet about it. This is not a major event worthy of a kernel log.
Diffstat (limited to 'bubblewrap.c')
-rw-r--r--bubblewrap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bubblewrap.c b/bubblewrap.c
index b3d52bc..7ef6709 100644
--- a/bubblewrap.c
+++ b/bubblewrap.c
@@ -2632,7 +2632,7 @@ main (int argc,
/* Mark everything as slave, so that we still
* receive mounts from the real root, but don't
* propagate mounts to the real root. */
- if (mount (NULL, "/", NULL, MS_SLAVE | MS_REC, NULL) < 0)
+ if (mount (NULL, "/", NULL, MS_SILENT | MS_SLAVE | MS_REC, NULL) < 0)
die_with_error ("Failed to make / slave");
/* Create a tmpfs which we will use as / in the namespace */
@@ -2655,7 +2655,7 @@ main (int argc,
if (mkdir ("newroot", 0755))
die_with_error ("Creating newroot failed");
- if (mount ("newroot", "newroot", NULL, MS_MGC_VAL | MS_BIND | MS_REC, NULL) < 0)
+ if (mount ("newroot", "newroot", NULL, MS_SILENT | MS_MGC_VAL | MS_BIND | MS_REC, NULL) < 0)
die_with_error ("setting up newroot bind");
if (mkdir ("oldroot", 0755))
@@ -2720,7 +2720,7 @@ main (int argc,
close_ops_fd ();
/* The old root better be rprivate or we will send unmount events to the parent namespace */
- if (mount ("oldroot", "oldroot", NULL, MS_REC | MS_PRIVATE, NULL) != 0)
+ if (mount ("oldroot", "oldroot", NULL, MS_SILENT | MS_REC | MS_PRIVATE, NULL) != 0)
die_with_error ("Failed to make old root rprivate");
if (umount2 ("oldroot", MNT_DETACH))