From 3903498d409e6a18fe5f879eaca1f5988478644e Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Sat, 11 Nov 2023 01:20:32 +0100 Subject: [PATCH] feat(iso): Modularize network unit file content (#21) --- setup.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/setup.sh b/setup.sh index 61f8b09..bcf383b 100644 --- a/setup.sh +++ b/setup.sh @@ -1295,11 +1295,54 @@ function set_root_pw () { function configure_networking () { #3.3 + local -a dns_addresses ntp_addresses + + # Begin network unit file with a default top section cat > '/mnt/etc/systemd/network/50-wired.network' <<"EOF" [Match] Name=en* [Network] +EOF + + # Decide on what comes next in network unit file + if [[ "${ARCHZBM_OS_CLIENT_IP}" ]] || \ + [[ "${ARCHZBM_OS_GATEWAY_IP}" ]] || \ + [[ "${ARCHZBM_OS_DNS_IP}" ]] || \ + [[ "${ARCHZBM_OS_NTP_IP}" ]]; then + + cat >> '/mnt/etc/systemd/network/50-wired.network' <> '/mnt/etc/systemd/network/50-wired.network' <> '/mnt/etc/systemd/network/50-wired.network' <> '/mnt/etc/systemd/network/50-wired.network' <<"EOF" +IPForward=yes +Domains=~. +EOF + else + cat >> '/mnt/etc/systemd/network/50-wired.network' <<"EOF" DHCP=ipv4 IPForward=yes @@ -1307,6 +1350,8 @@ IPForward=yes UseDNS=yes RouteMetric=10 EOF + fi + systemctl enable 'systemd-networkd' --root='/mnt' systemctl disable 'systemd-networkd-wait-online' --root='/mnt' }