summaryrefslogtreecommitdiffstats
path: root/core/modules/networkd-dispatcher
diff options
context:
space:
mode:
authorJonathan Bauer2019-06-17 10:47:21 +0200
committerJonathan Bauer2019-06-17 10:47:21 +0200
commit0e257adc74a70d169ce1822195e2763457ef55a2 (patch)
tree562c243bbaa894aa01b73e6cd95b72fa46ad3d3c /core/modules/networkd-dispatcher
parent[vbox-src] add missing dep (diff)
downloadmltk-0e257adc74a70d169ce1822195e2763457ef55a2.tar.gz
mltk-0e257adc74a70d169ce1822195e2763457ef55a2.tar.xz
mltk-0e257adc74a70d169ce1822195e2763457ef55a2.zip
[networkd-dispatcher] hack for login crashes...
Diffstat (limited to 'core/modules/networkd-dispatcher')
-rwxr-xr-xcore/modules/networkd-dispatcher/data/etc/networkd-dispatcher/routable.d/00-fallback-dns-lookup.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/core/modules/networkd-dispatcher/data/etc/networkd-dispatcher/routable.d/00-fallback-dns-lookup.sh b/core/modules/networkd-dispatcher/data/etc/networkd-dispatcher/routable.d/00-fallback-dns-lookup.sh
index 84f85258..ebf2d7ae 100755
--- a/core/modules/networkd-dispatcher/data/etc/networkd-dispatcher/routable.d/00-fallback-dns-lookup.sh
+++ b/core/modules/networkd-dispatcher/data/etc/networkd-dispatcher/routable.d/00-fallback-dns-lookup.sh
@@ -47,7 +47,7 @@ check_dns() {
if [ "$dhcp_hostname" != "$(hostname)" ]; then
echo "Current hostname differs from DHCP, forcing DHCP hostname: '$dhcp_hostname'"
echo "systemd-networkd should have set it but did not. Check your configuration."
- hostnamectl set-hostname "$dhcp_hostname"
+ set_hostname "$dhcp_hostname"
fi
return 0
fi
@@ -57,14 +57,18 @@ check_dns() {
if [ -n "$dns_hostname" ]; then
if [ "$dns_hostname" != "$(hostname)" ]; then
echo "Current hostname differs from DNS, forcing DNS hostname: '$dns_hostname'"
- hostnamectl set-hostname "$dns_hostname"
+ set_hostname "$dns_hostname"
fi
else
echo "Neither DHCP nor DNS provided a hostname, use IP address as fallback."
- hostnamectl set-hostname "${ADDR//./-}"
+ set_hostname "${ADDR//./-}"
fi
return 0
}
+set_hostname() {
+ hostnamectl set-hostname "$1"
+ systemctl try-restart lightdm
+}
if [ ! -e /opt/openslx/config ]; then
echo "No OpenSLX configuration found - aborting."