summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-04-25 13:49:01 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-04-25 17:06:42 +0200
commitf449a29bb9914f2645f37a3e177afef1e2c0536a (patch)
treee02f418160511ab6430a3e93248a294cc6dec568
parenttest: Skip meson integration tests if SYSTEMD_INTEGRATION_TESTS != 1 (diff)
downloadsystemd-f449a29bb9914f2645f37a3e177afef1e2c0536a.tar.xz
systemd-f449a29bb9914f2645f37a3e177afef1e2c0536a.zip
portable: Don't fail if /etc/resolv.conf doesn't exist
The portable profiles assume /etc/resolv.conf exists, which isn't always the case. Let's mark the mounts as optional so we don't fail to start the unit if /etc/resolv.conf doesn't exist.
-rw-r--r--src/portable/profile/default/service.conf2
-rw-r--r--src/portable/profile/trusted/service.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/portable/profile/default/service.conf b/src/portable/profile/default/service.conf
index 230aa60781..5c447d6641 100644
--- a/src/portable/profile/default/service.conf
+++ b/src/portable/profile/default/service.conf
@@ -4,7 +4,7 @@
MountAPIVFS=yes
BindReadOnlyPaths=/dev/log /run/systemd/journal/socket /run/systemd/journal/stdout
BindReadOnlyPaths=/etc/machine-id
-BindReadOnlyPaths=/etc/resolv.conf
+BindReadOnlyPaths=-/etc/resolv.conf
BindReadOnlyPaths=/run/dbus/system_bus_socket
DynamicUser=yes
RemoveIPC=yes
diff --git a/src/portable/profile/trusted/service.conf b/src/portable/profile/trusted/service.conf
index 04deeb2262..144d4f6c23 100644
--- a/src/portable/profile/trusted/service.conf
+++ b/src/portable/profile/trusted/service.conf
@@ -5,4 +5,4 @@ MountAPIVFS=yes
PrivateTmp=yes
BindPaths=/run
BindReadOnlyPaths=/etc/machine-id
-BindReadOnlyPaths=/etc/resolv.conf
+BindReadOnlyPaths=-/etc/resolv.conf