jiang/kali-arm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*: Move to nameserver variable.

Browse Source 
This breaks the un-converted scripts but that gives more reason to move them to the new way over the coming days.
This commit is contained in:
Steev Klimaszewski
2021-09-15 16:57:00 -05:00
parent 6d8db50727
commit a2cd18e5ff
28 changed files with 49 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
banana-pi.sh
View File

@@ -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

4
banana-pro.sh
View File

@@ -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
clean_build

6
beaglebone-black.sh
View File

@@ -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})

6
chromebook-arm-exynos.sh
View File

@@ -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})

6
chromebook-arm-nyan.sh
View File

@@ -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})

6
chromebook-arm-veyron.sh
View File

@@ -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

6
cubieboard2.sh
View File

@@ -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})

6
cubietruck.sh
View File

@@ -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})

6
cubox-i4-pro.sh
View File

@@ -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})

6
cubox.sh
View File

@@ -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})

2
gateworks-newport.sh
View File

@@ -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

4
gateworks-ventana.sh
View File

@@ -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
clean_build

6
mini-x.sh
View File

@@ -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})

2
nanopc-t3.sh
View File

@@ -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

2
nanopi-neo-plus2-minimal.sh
View File

@@ -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

2
nanopi-neo-plus2.sh
View File

@@ -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

6
nanopi2.sh
View File

@@ -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})

6
odroid-c.sh
View File

@@ -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})

2
odroid-c2.sh
View File

@@ -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

6
odroid-u2.sh
View File

@@ -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/

8
odroid-xu3.sh
View File

@@ -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
clean_build

2
pinebook-pro.sh
View File

@@ -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

2
pinebook.sh
View File

@@ -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

6
riotboard.sh
View File

@@ -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})

6
trimslice.sh
View File

@@ -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})

6
usb-armory-mk1.sh
View File

@@ -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})

4
usb-armory-mk2.sh
View File

@@ -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
clean_build

6
utilite-pro.sh
View File

@@ -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})