summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2018-11-12 11:52:19 +0100
committerJonathan Bauer2018-11-12 11:52:19 +0100
commitbe0604f8f6fbb4891e1c9d93b61a76c922a465c1 (patch)
tree0d542167c81d282ca10ffe50d6ed3a02db30e681
parentremove deprecated wlan-boot module (diff)
downloadsystemd-init-0.1.tar.gz
systemd-init-0.1.tar.xz
systemd-init-0.1.zip
in bridge mode, do not copy the physical interface configurationv0.1
This prevents systemd from bringing down the interface leading to a short network outage, delaying the rest of the boot process until it has brought it up again.
-rw-r--r--builder/modules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/builder/modules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh b/builder/modules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh
index 255b629e..1b300360 100644
--- a/builder/modules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh
+++ b/builder/modules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh
@@ -14,7 +14,7 @@ NETWORKD_DIR="/etc/systemd/network"
mkdir -p "${NEWROOT}/${NETWORKD_DIR}" # dirname a-la bash
# First, copy over every configuration made so far
-cp "${NETWORKD_DIR}/"* "${NEWROOT}/${NETWORKD_DIR}"
+cp "${NETWORKD_DIR}/${SLX_BRIDGE}"* "${NEWROOT}/${NETWORKD_DIR}"
# Workaround: UseHostname seems broken, so manually set the hostname for now...
[ -n "${SLX_HOSTNAME}" ] && echo "${SLX_HOSTNAME}" > $NEWROOT/etc/hostname