summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-includes/lib
diff options
context:
space:
mode:
Diffstat (limited to 'config/chroot_local-includes/lib')
-rw-r--r--config/chroot_local-includes/lib/systemd/system/tails-unblock-network.service15
1 files changed, 9 insertions, 6 deletions
diff --git a/config/chroot_local-includes/lib/systemd/system/tails-unblock-network.service b/config/chroot_local-includes/lib/systemd/system/tails-unblock-network.service
index e8feaca..f9836e0 100644
--- a/config/chroot_local-includes/lib/systemd/system/tails-unblock-network.service
+++ b/config/chroot_local-includes/lib/systemd/system/tails-unblock-network.service
@@ -5,15 +5,18 @@ Documentation=https://tails.boum.org/contribute/design/MAC_address/
[Service]
Type=oneshot
RemainAfterExit=yes
-EnvironmentFile=/var/lib/gdm3/tails.physical_security
+EnvironmentFile=/var/lib/gdm3/tails.network
-# It's important we "export" the settings from tails.physical_security
-# before unblocking the network; doing so will make the user-set MAC spoofing
+# It's important we "export" the settings from tails.macspoof before
+# unblocking the network; doing so will make the user-set MAC spoofing
# option apply (via the custom udev rule) when loading the modules for the
# previously blocked network devices.
-ExecStartPre=/usr/bin/install -m 0640 -o root -g root \
- /var/lib/gdm3/tails.physical_security \
- /var/lib/live/config/tails.physical_security
+ExecStartPre=/bin/sh -c \
+ 'for setting in macspoof network; do \
+ /usr/bin/install -m 0640 -o root -g root \
+ "/var/lib/gdm3/tails.$setting" \
+ "/var/lib/live/config/tails.$setting" ; \
+ done'
ExecStartPre=/bin/sync
ExecStartPre=/bin/sh -c \
'if [ "${TAILS_NETCONF}" = "obstacle" ] ; then \