summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-includes/lib
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-10-05 14:52:48 +0000
committerintrigeri <intrigeri@boum.org>2019-10-05 14:52:48 +0000
commit53c6c19a4ede83bcc99337a46c70b8dfe7277f42 (patch)
treec7bb5b55c1a786545a38e44cdf4fe12fbcb39dfd /config/chroot_local-includes/lib
parent9a8ca93d4bd1e2bd42a15a841c37c4ace55df222 (diff)
parent7f06da770fc2c555fabf602943b583ae11ed08bf (diff)
Merge branch 'feature/17098-refactor-greeter' into devel (Closes: #17098, #17089, #16806, #13447, #17087, #17058, #17101, #6525, #16095, #16094, #16093)
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 \