From 6ee184d6cb11be436bbcd5716a6162e4ce12a09e Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Tue, 2 Mar 2021 14:07:14 -0500 Subject: slight refactor --- initramfs-tools/scripts/samizdat | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat index 93c84d2..89e39ef 100644 --- a/initramfs-tools/scripts/samizdat +++ b/initramfs-tools/scripts/samizdat @@ -38,6 +38,15 @@ run_nbd_client() bootdone nbd-script) } +write_resolv_dot_conf() +{ + + if [ "$IPV4DNS0" != '0.0.0.0' ]; then + printf '%s\n' "$IPV4DNS0" "$IPV4DNS1" | + sed -e '/^0.0.0.0$/d; s/^/nameserver /' > /root/etc/resolv.conf + fi +} + mountroot() { openvt -c 13 sh @@ -57,11 +66,7 @@ mountroot() samizdat_install_udev_rules bootwait samizdat-gpg bootwait root-mounted - - if [ "$IPV4DNS0" != '0.0.0.0' ]; then - printf '%s\n' "$IPV4DNS0" "$IPV4DNS1" | - sed -e '/^0.0.0.0$/d; s/^/nameserver /' > /root/etc/resolv.conf - fi + write_resolv_dot_conf chvt 1 } -- cgit v1.2.3