summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2018-09-07 12:42:30 +0200
committertorben2018-09-07 12:42:30 +0200
commit219a63d18e8dc82c3dc9e111c05942d5c9acd02b (patch)
treefe1390c9d38c06807c81cc769fa37b1268cb3772
parentfix. (diff)
downloadsystemd-init-219a63d18e8dc82c3dc9e111c05942d5c9acd02b.tar.gz
systemd-init-219a63d18e8dc82c3dc9e111c05942d5c9acd02b.tar.xz
systemd-init-219a63d18e8dc82c3dc9e111c05942d5c9acd02b.zip
fix.
-rwxr-xr-xmodules.d/systemd-networkd-ext/hooks/convert-kcl-network-configuration-to-systemd-service-files.sh14
-rwxr-xr-xmodules.d/systemd-networkd-ext/module-setup.sh5
2 files changed, 10 insertions, 9 deletions
diff --git a/modules.d/systemd-networkd-ext/hooks/convert-kcl-network-configuration-to-systemd-service-files.sh b/modules.d/systemd-networkd-ext/hooks/convert-kcl-network-configuration-to-systemd-service-files.sh
index 722127d4..f0f1edd4 100755
--- a/modules.d/systemd-networkd-ext/hooks/convert-kcl-network-configuration-to-systemd-service-files.sh
+++ b/modules.d/systemd-networkd-ext/hooks/convert-kcl-network-configuration-to-systemd-service-files.sh
@@ -157,8 +157,8 @@ Name=$BOOTIF_NAME
EOF
) > "/etc/systemd/network/$BOOTIF_NAME.link"
fi
+ local reload=fals
if [ "$WIRELESS_BOOTIF" = false ]; then
- local reload=fals
if rm \
--force \
/usr/lib/systemd/system/network.target.wants/iwd.service \
@@ -173,9 +173,6 @@ EOF
then
reload=true
fi
- if $reload; then
- systemctl daemon-reload
- fi
else
local WIRELESS_BOOTIF_NETWORK_CONF="/etc/systemd/network/$WIRELESS_BOOTIF_NAME.network"
(
@@ -215,6 +212,12 @@ Description=Critical wireless network device.
Name=$WIRELESS_BOOTIF_NAME
EOF
) > "/etc/systemd/network/$WIRELESS_BOOTIF_NAME.link"
+ ln \
+ --force \
+ --symbolic \
+ "../macspoof@.service" \
+ "/usr/lib/systemd/system/network.target.wants/macspoof@wireless.service"
+ reload=true
fi
if [[ "$VLAN" != '' ]]; then
local VLAN_DEV_CONF="/etc/systemd/network/$BOOTIF_NAME.$VLAN.netdev"
@@ -275,6 +278,9 @@ EOF
echo LinkLocalAddressing=no
) > "$BRIDGE_NETWORK_CONF"
fi
+ if $reload; then
+ systemctl daemon-reload
+ fi
return 0
}
# from parse-ip-opts.sh
diff --git a/modules.d/systemd-networkd-ext/module-setup.sh b/modules.d/systemd-networkd-ext/module-setup.sh
index c42db588..49be57eb 100755
--- a/modules.d/systemd-networkd-ext/module-setup.sh
+++ b/modules.d/systemd-networkd-ext/module-setup.sh
@@ -256,11 +256,6 @@ install() {
# in the service file's install section).
mkdir $initdir/$systemdsystemunitdir/network.target.wants
ln \
- --force \
- --symbolic \
- "$systemdsystemunitdir/macspoof@.service" \
- "$initdir/$systemdsystemunitdir/network.target.wants/macspoof@wireless.service"
- ln \
--symbolic \
"$systemdsystemunitdir/systemd-resolved.service" \
"$initdir/$systemdsystemunitdir/network.target.wants/systemd-resolved.service"