Commit b0a2d99d authored by anonym's avatar anonym
Browse files

Merge remote-tracking branch 'origin/bugfix/9012-unblock-network' into devel

Fix-committed: #9012
parents d2a253b3 744ad738
......@@ -26,5 +26,6 @@ ExecStartPre=/bin/sh -c \
ExecStart=/bin/sh -c \
'if [ "${TAILS_NETCONF}" != "disabled" ] ; then \
/bin/rm -f /etc/modprobe.d/all-net-blacklist.conf ; \
/bin/touch /etc/modprobe.d ; \
/bin/sync ; \
fi'
......@@ -11,9 +11,14 @@ systemctl start tails-unblock-network.service
# blacklist file) and udevadm trigger, possibly caused by yet another aufs
# weirdness (#9012)...
echo "Sleeping..." >&2
sleep 2
sleep 5
echo "slept." >&2
# XXX: add debugging information for #9012 to the Journal
ls /etc/modprobe.d
/sbin/lsmod
ls -l /sys/class/net
# Now we'll load any present network device previously blocked by
# the blacklist. In particular, the MAC spoofing udev rule should trigger
# for each network device added.
......@@ -30,6 +35,10 @@ echo "Restarting systemd-udev-settle.service..." >&2
systemctl restart systemd-udev-settle.service
echo "systemd-udev-settle.service restarted." >&2
# XXX: add debugging information for #9012 to the Journal
/sbin/lsmod
ls -l /sys/class/net
# Enable and start NetworkManager services
# No need to manually enable NetworkManager-dispatcher.service,
# as NetworkManager.service has "Also=NetworkManager-dispatcher.service"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment