19-define-os-ip #24

Merged
hygienic-books merged 23 commits from 19-define-os-ip into main 2023-11-12 03:26:37 +00:00
Showing only changes of commit 3903498d40 - Show all commits

View File

@ -1295,11 +1295,54 @@ function set_root_pw () {
function configure_networking () { function configure_networking () {
#3.3 #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" cat > '/mnt/etc/systemd/network/50-wired.network' <<"EOF"
[Match] [Match]
Name=en* Name=en*
[Network] [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' <<EOF
Address="${ARCHZBM_OS_CLIENT_IP}"
Gateway="${ARCHZBM_OS_GATEWAY_IP}"
EOF
if [[ "${ARCHZBM_OS_DNS_IP}" ]]; then
mapfile -t dns_addresses < <(<<<"${ARCHZBM_OS_DNS_IP}" tr ',' '\n' | sed '/^$/d')
else
dns_addresses+=('8.8.8.8')
dns_addresses+=('8.8.4.4')
fi
for dns_addr in "${dns_addresses[@]}"; do
cat >> '/mnt/etc/systemd/network/50-wired.network' <<EOF
DNS="${dns_addr}"
EOF
done
if [[ "${ARCHZBM_OS_NTP_IP}" ]]; then
mapfile -t ntp_addresses < <(<<<"${ARCHZBM_OS_NTP_IP}" tr ',' '\n' | sed '/^$/d')
for ntp_addr in "${ntp_addresses[@]}"; do
cat >> '/mnt/etc/systemd/network/50-wired.network' <<EOF
NTP="${ntp_addr}"
EOF
done
fi
cat >> '/mnt/etc/systemd/network/50-wired.network' <<"EOF"
IPForward=yes
Domains=~.
EOF
else
cat >> '/mnt/etc/systemd/network/50-wired.network' <<"EOF"
DHCP=ipv4 DHCP=ipv4
IPForward=yes IPForward=yes
@ -1307,6 +1350,8 @@ IPForward=yes
UseDNS=yes UseDNS=yes
RouteMetric=10 RouteMetric=10
EOF EOF
fi
systemctl enable 'systemd-networkd' --root='/mnt' systemctl enable 'systemd-networkd' --root='/mnt'
systemctl disable 'systemd-networkd-wait-online' --root='/mnt' systemctl disable 'systemd-networkd-wait-online' --root='/mnt'
} }