From a2cd18e5ff99d1f3c69c0d7c91697fbabb698a62 Mon Sep 17 00:00:00 2001
From: Steev Klimaszewski <steev@kali.org>
Date: Wed, 15 Sep 2021 16:57:00 -0500
Subject: [PATCH] *: Move to nameserver variable.

This breaks the un-converted scripts but that gives more reason to move them to the new way over the coming days.
---
 banana-pi.sh                | 2 +-
 banana-pro.sh               | 4 ++--
 beaglebone-black.sh         | 6 ++----
 chromebook-arm-exynos.sh    | 6 ++----
 chromebook-arm-nyan.sh      | 6 ++----
 chromebook-arm-veyron.sh    | 6 ++----
 cubieboard2.sh              | 6 ++----
 cubietruck.sh               | 6 ++----
 cubox-i4-pro.sh             | 6 ++----
 cubox.sh                    | 6 ++----
 gateworks-newport.sh        | 2 +-
 gateworks-ventana.sh        | 4 ++--
 mini-x.sh                   | 6 ++----
 nanopc-t3.sh                | 2 +-
 nanopi-neo-plus2-minimal.sh | 2 +-
 nanopi-neo-plus2.sh         | 2 +-
 nanopi2.sh                  | 6 ++----
 odroid-c.sh                 | 6 ++----
 odroid-c2.sh                | 2 +-
 odroid-u2.sh                | 6 ++----
 odroid-xu3.sh               | 8 +++-----
 pinebook-pro.sh             | 2 +-
 pinebook.sh                 | 2 +-
 riotboard.sh                | 6 ++----
 trimslice.sh                | 6 ++----
 usb-armory-mk1.sh           | 6 ++----
 usb-armory-mk2.sh           | 4 ++--
 utilite-pro.sh              | 6 ++----
 28 files changed, 49 insertions(+), 83 deletions(-)

diff --git a/banana-pi.sh b/banana-pi.sh
index 22c48ff..0f386c8 100755
--- a/banana-pi.sh
+++ b/banana-pi.sh
@@ -126,7 +126,7 @@ set_locale "$locale"
 # Clean system
 include clean_system
 # Define DNS server after last running systemd-nspawn.
-echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled.
 disable_proxy
 # Mirror & suite replacement
diff --git a/banana-pro.sh b/banana-pro.sh
index 78e2312..f9c59f0 100755
--- a/banana-pro.sh
+++ b/banana-pro.sh
@@ -126,7 +126,7 @@ set_locale "$locale"
 # Clean system
 include clean_system
 # Define DNS server after last running systemd-nspawn.
-echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled.
 disable_proxy
 # Mirror & suite replacement
@@ -187,4 +187,4 @@ include compress_img
 
 # Clean up all the temporary build stuff and remove the directories.
 # Comment this out to keep things around if you want to see what may have gone wrong.
-clean_build
\ No newline at end of file
+clean_build
diff --git a/beaglebone-black.sh b/beaglebone-black.sh
index 8496054..3f64989 100755
--- a/beaglebone-black.sh
+++ b/beaglebone-black.sh
@@ -182,7 +182,7 @@ iface eth0 inet dhcp
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -485,9 +485,7 @@ mkdir -p "${basedir}"/root/boot
 mount ${bootp} "${basedir}"/root/boot
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
diff --git a/chromebook-arm-exynos.sh b/chromebook-arm-exynos.sh
index 745b8d4..14dde9f 100755
--- a/chromebook-arm-exynos.sh
+++ b/chromebook-arm-exynos.sh
@@ -179,7 +179,7 @@ iface lo inet loopback
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -684,9 +684,7 @@ mkdir -p "${basedir}"/root
 mount ${rootp} "${basedir}"/root
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
diff --git a/chromebook-arm-nyan.sh b/chromebook-arm-nyan.sh
index 8da8c8b..f13f461 100755
--- a/chromebook-arm-nyan.sh
+++ b/chromebook-arm-nyan.sh
@@ -180,7 +180,7 @@ iface lo inet loopback
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -590,9 +590,7 @@ mkdir -p "${basedir}"/root
 mount ${rootp} "${basedir}"/root
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
diff --git a/chromebook-arm-veyron.sh b/chromebook-arm-veyron.sh
index 5c4ccbf..9a0fc0f 100755
--- a/chromebook-arm-veyron.sh
+++ b/chromebook-arm-veyron.sh
@@ -184,7 +184,7 @@ iface eth0 inet dhcp
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -302,9 +302,7 @@ if [[ ! -z "${4}" || ! -z "${5}" ]]; then
   suite=${5}
 fi
 
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Define sources.list
 cat << EOF > ${work_dir}/etc/apt/sources.list
diff --git a/cubieboard2.sh b/cubieboard2.sh
index 774e53f..5f21e01 100755
--- a/cubieboard2.sh
+++ b/cubieboard2.sh
@@ -182,7 +182,7 @@ iface eth0 inet dhcp
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -406,9 +406,7 @@ mkdir -p "${basedir}"/root/boot
 mount ${bootp} "${basedir}"/root/boot
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
diff --git a/cubietruck.sh b/cubietruck.sh
index bfbb1fc..b5fee6f 100755
--- a/cubietruck.sh
+++ b/cubietruck.sh
@@ -182,7 +182,7 @@ iface eth0 inet dhcp
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -406,9 +406,7 @@ mkdir -p "${basedir}"/root/boot
 mount ${bootp} "${basedir}"/root/boot
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
diff --git a/cubox-i4-pro.sh b/cubox-i4-pro.sh
index 2713019..a3a9127 100755
--- a/cubox-i4-pro.sh
+++ b/cubox-i4-pro.sh
@@ -184,7 +184,7 @@ iface eth0 inet dhcp
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -366,9 +366,7 @@ mkdir -p "${basedir}"/root
 mount ${rootp} "${basedir}"/root
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
diff --git a/cubox.sh b/cubox.sh
index 3e61dc4..006732e 100755
--- a/cubox.sh
+++ b/cubox.sh
@@ -184,7 +184,7 @@ iface eth0 inet dhcp
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -421,9 +421,7 @@ mkdir -p "${basedir}"/root
 mount ${rootp} "${basedir}"/root
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
diff --git a/gateworks-newport.sh b/gateworks-newport.sh
index eb4dca8..1aa8b1a 100755
--- a/gateworks-newport.sh
+++ b/gateworks-newport.sh
@@ -119,7 +119,7 @@ set_locale "$locale"
 # Clean system
 include clean_system
 # Define DNS server after last running systemd-nspawn.
-echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled.
 disable_proxy
 # Mirror & suite replacement
diff --git a/gateworks-ventana.sh b/gateworks-ventana.sh
index f20ca50..5a8a255 100755
--- a/gateworks-ventana.sh
+++ b/gateworks-ventana.sh
@@ -118,7 +118,7 @@ set_locale "$locale"
 # Clean system
 include clean_system
 # Define DNS server after last running systemd-nspawn.
-echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled.
 disable_proxy
 # Mirror & suite replacement
@@ -244,4 +244,4 @@ include compress_img
 
 # Clean up all the temporary build stuff and remove the directories.
 # Comment this out to keep things around if you want to see what may have gone wrong.
-clean_build
\ No newline at end of file
+clean_build
diff --git a/mini-x.sh b/mini-x.sh
index bde0d84..603b625 100755
--- a/mini-x.sh
+++ b/mini-x.sh
@@ -182,7 +182,7 @@ iface eth0 inet dhcp
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -357,9 +357,7 @@ mkdir -p "${basedir}"/root
 mount ${rootp} "${basedir}"/root
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
diff --git a/nanopc-t3.sh b/nanopc-t3.sh
index 44a5dbd..85a796a 100755
--- a/nanopc-t3.sh
+++ b/nanopc-t3.sh
@@ -119,7 +119,7 @@ set_locale "$locale"
 # Clean system
 include clean_system
 # Define DNS server after last running systemd-nspawn.
-echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled.
 disable_proxy
 # Mirror & suite replacement
diff --git a/nanopi-neo-plus2-minimal.sh b/nanopi-neo-plus2-minimal.sh
index a8716aa..9f09b8b 100755
--- a/nanopi-neo-plus2-minimal.sh
+++ b/nanopi-neo-plus2-minimal.sh
@@ -190,7 +190,7 @@ set_locale "$locale"
 # Clean system
 include clean_system
 # Define DNS server after last running systemd-nspawn.
-echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled.
 disable_proxy
 # Mirror & suite replacement
diff --git a/nanopi-neo-plus2.sh b/nanopi-neo-plus2.sh
index 1953fb0..253cc80 100755
--- a/nanopi-neo-plus2.sh
+++ b/nanopi-neo-plus2.sh
@@ -204,7 +204,7 @@ set_locale "$locale"
 # Clean system
 include clean_system
 # Define DNS server after last running systemd-nspawn.
-echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled.
 disable_proxy
 # Mirror & suite replacement
diff --git a/nanopi2.sh b/nanopi2.sh
index 602e995..76d1e81 100755
--- a/nanopi2.sh
+++ b/nanopi2.sh
@@ -191,7 +191,7 @@ alias net-pf-10 off
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -462,9 +462,7 @@ mkdir -p "${basedir}"/root/boot
 mount ${bootp} "${basedir}"/root/boot
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
diff --git a/odroid-c.sh b/odroid-c.sh
index a8db89d..8225af6 100755
--- a/odroid-c.sh
+++ b/odroid-c.sh
@@ -185,7 +185,7 @@ iface eth0 inet dhcp
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -605,9 +605,7 @@ mkdir -p "${basedir}"/root/boot
 mount ${bootp} "${basedir}"/root/boot
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
diff --git a/odroid-c2.sh b/odroid-c2.sh
index b5d8bcd..41679bd 100755
--- a/odroid-c2.sh
+++ b/odroid-c2.sh
@@ -131,7 +131,7 @@ set_locale "$locale"
 # Clean system
 include clean_system
 # Define DNS server after last running systemd-nspawn.
-echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled.
 disable_proxy
 # Mirror & suite replacement
diff --git a/odroid-u2.sh b/odroid-u2.sh
index e9f7e6a..9811be5 100755
--- a/odroid-u2.sh
+++ b/odroid-u2.sh
@@ -185,7 +185,7 @@ iface eth0 inet dhcp
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -451,9 +451,7 @@ mkdir -p "${basedir}"/root/boot
 mount ${bootp} "${basedir}"/root/boot
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 echo "Rsyncing rootfs into image file"
 rsync -HPavz -q ${work_dir}/ ${basedir}/root/
diff --git a/odroid-xu3.sh b/odroid-xu3.sh
index e6b44cd..b42b1af 100755
--- a/odroid-xu3.sh
+++ b/odroid-xu3.sh
@@ -136,7 +136,7 @@ set_locale "$locale"
 # Clean system
 include clean_system
 # Define DNS server after last running systemd-nspawn.
-echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled.
 disable_proxy
 # Mirror & suite replacement
@@ -264,9 +264,7 @@ mkdir -p "${basedir}"/root/boot
 mount "${bootp}" "${basedir}"/root/boot
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
@@ -302,4 +300,4 @@ include compress_img
 
 # Clean up all the temporary build stuff and remove the directories.
 # Comment this out to keep things around if you want to see what may have gone wrong.
-clean_build
\ No newline at end of file
+clean_build
diff --git a/pinebook-pro.sh b/pinebook-pro.sh
index bf0eba1..eacc9d1 100755
--- a/pinebook-pro.sh
+++ b/pinebook-pro.sh
@@ -128,7 +128,7 @@ set_locale "$locale"
 # Clean system
 include clean_system
 # Define DNS server after last running systemd-nspawn.
-echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled.
 disable_proxy
 # Mirror & suite replacement
diff --git a/pinebook.sh b/pinebook.sh
index f05cc42..90201d7 100755
--- a/pinebook.sh
+++ b/pinebook.sh
@@ -195,7 +195,7 @@ set_locale "$locale"
 # Clean system
 include clean_system
 # Define DNS server after last running systemd-nspawn.
-echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled.
 disable_proxy
 # Mirror & suite replacement
diff --git a/riotboard.sh b/riotboard.sh
index 4ba0640..5f87389 100755
--- a/riotboard.sh
+++ b/riotboard.sh
@@ -188,7 +188,7 @@ iface eth0 inet dhcp
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -433,9 +433,7 @@ mkdir -p "${basedir}"/root/boot
 mount ${bootp} "${basedir}"/root/boot
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
diff --git a/trimslice.sh b/trimslice.sh
index bc13df4..51665a4 100755
--- a/trimslice.sh
+++ b/trimslice.sh
@@ -185,7 +185,7 @@ iface eth0 inet dhcp
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -404,9 +404,7 @@ mkdir -p "${basedir}"/root/boot
 mount ${bootp} "${basedir}"/root/boot
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
diff --git a/usb-armory-mk1.sh b/usb-armory-mk1.sh
index 85d5ebb..e9fcb02 100755
--- a/usb-armory-mk1.sh
+++ b/usb-armory-mk1.sh
@@ -182,7 +182,7 @@ iface eth0 inet dhcp
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -536,9 +536,7 @@ mkdir -p "${basedir}"/root
 mount ${rootp} "${basedir}"/root
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})
diff --git a/usb-armory-mk2.sh b/usb-armory-mk2.sh
index 2cc9227..0000c72 100755
--- a/usb-armory-mk2.sh
+++ b/usb-armory-mk2.sh
@@ -161,7 +161,7 @@ set_locale "$locale"
 # Clean system
 include clean_system
 # Define DNS server after last running systemd-nspawn.
-echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled.
 disable_proxy
 # Mirror & suite replacement
@@ -261,4 +261,4 @@ include compress_img
 
 # Clean up all the temporary build stuff and remove the directories.
 # Comment this out to keep things around if you want to see what may have gone wrong.
-clean_build
\ No newline at end of file
+clean_build
diff --git a/utilite-pro.sh b/utilite-pro.sh
index 4095592..69244fa 100755
--- a/utilite-pro.sh
+++ b/utilite-pro.sh
@@ -186,7 +186,7 @@ iface eth0 inet dhcp
 EOF
 
 # DNS server
-echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Copy directory bsp into build dir.
 cp -rp bsp ${work_dir}
@@ -447,9 +447,7 @@ mkdir -p "${basedir}"/root/boot
 mount ${bootp} "${basedir}"/root/boot
 
 # We do this down here to get rid of the build system's resolv.conf after running through the build.
-cat << EOF > ${work_dir}/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
+echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
 
 # Create an fstab so that we don't mount / read-only.
 UUID=$(blkid -s UUID -o value ${rootp})