summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrantisek Sumsal <frantisek@sumsal.cz>2023-05-16 11:40:33 +0200
committerFrantisek Sumsal <frantisek@sumsal.cz>2023-05-16 11:40:33 +0200
commitcd70372b934bded2249f26c72d4b6ab9bdf50a13 (patch)
tree15f873a5afc31e5831e3f5925c7571235df53ddd
parentf00519b5b376cad0f19c3760ad95a970908016d1 (diff)
downloadsystemd-cd70372b934bded2249f26c72d4b6ab9bdf50a13.tar.gz
nspawn: make sure the device type survives when setting device mode
-rw-r--r--src/nspawn/nspawn-oci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn-oci.c b/src/nspawn/nspawn-oci.c
index c79f9c62d7..5e21538597 100644
--- a/src/nspawn/nspawn-oci.c
+++ b/src/nspawn/nspawn-oci.c
@@ -819,7 +819,7 @@ static int oci_device_file_mode(const char *name, JsonVariant *v, JsonDispatchFl
return json_log(v, flags, SYNTHETIC_ERRNO(ERANGE),
"fileMode out of range, refusing.");
- *mode = m;
+ *mode = (*mode & ~07777) | m;
return 0;
}