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

Include disable proxy, mirror restore and dns on clean_system script

Browse Source
This commit is contained in:
Fran
2021-09-18 11:50:14 +02:00
committed by Fran Rodríguez
parent 73ff96c74e
commit 0ff3de4495
19 changed files with 25 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
banana-pi.sh
View File

@@ -125,14 +125,6 @@ systemd-nspawn_exec /third-stage
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# Create an fstab so that we don't mount / read-only. # Create an fstab so that we don't mount / read-only.
UUID=$(blkid -s UUID -o value ${rootp}) UUID=$(blkid -s UUID -o value ${rootp})

8
banana-pro.sh
View File

@@ -125,14 +125,6 @@ systemd-nspawn_exec /third-stage
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# Create an fstab so that we don't mount / read-only. # Create an fstab so that we don't mount / read-only.
UUID=$(blkid -s UUID -o value ${rootp}) UUID=$(blkid -s UUID -o value ${rootp})

11
common.d/clean_system.sh
View File

@@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck disable=SC2154
# Clean system # Clean system
systemd-nspawn_exec <<'EOF' systemd-nspawn_exec <<'EOF'
@@ -27,3 +28,13 @@ EOF
rm -f "${work_dir}"/etc/machine-id || true rm -f "${work_dir}"/etc/machine-id || true
touch "${work_dir}"/etc/machine-id touch "${work_dir}"/etc/machine-id
rm -f "${work_dir}"/var/lib/dbus/machine-id || true rm -f "${work_dir}"/var/lib/dbus/machine-id || true
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf

11
gateworks-newport.sh
View File

@@ -118,14 +118,7 @@ systemd-nspawn_exec /third-stage
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
cd "${basedir}" cd "${basedir}"
# Do the kernel stuff... # Do the kernel stuff...
@@ -134,7 +127,7 @@ cd ${work_dir}/usr/src/kernel
# Don't change the version because of our patches. # Don't change the version because of our patches.
touch .scmversion touch .scmversion
export ARCH=arm64 export ARCH=arm64
export CROSS_COMPILE=aarch64-linux-gnu- export CROSS_COMPILE=aarch64-linux-gnu-
patch -p1 < ${current_dir}/patches/kali-wifi-injection-5.4.patch patch -p1 < ${current_dir}/patches/kali-wifi-injection-5.4.patch
patch -p1 < ${current_dir}/patches/0001-wireless-carl9170-Enable-sniffer-mode-promisc-flag-t.patch patch -p1 < ${current_dir}/patches/0001-wireless-carl9170-Enable-sniffer-mode-promisc-flag-t.patch
cp ${current_dir}/kernel-configs/gateworks-newport-5.4.45.config .config cp ${current_dir}/kernel-configs/gateworks-newport-5.4.45.config .config

11
gateworks-ventana.sh
View File

@@ -117,14 +117,7 @@ systemd-nspawn_exec /third-stage
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# Set up usb gadget mode # Set up usb gadget mode
cat << EOF > ${work_dir}/etc/dhcp/dhcpd.conf cat << EOF > ${work_dir}/etc/dhcp/dhcpd.conf
@@ -239,7 +232,7 @@ umount -l "${rootp}"
e2fsck -y -f "$rootp" e2fsck -y -f "$rootp"
# Remove loop devices # Remove loop devices
kpartx -dv "${loopdevice}" kpartx -dv "${loopdevice}"
losetup -d "${loopdevice}" losetup -d "${loopdevice}"
# Compress image compilation # Compress image compilation

10
nanopc-t3.sh
View File

@@ -118,14 +118,6 @@ systemd-nspawn_exec /third-stage
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# Kernel section. If you want to use a custom kernel, or configuration, replace # Kernel section. If you want to use a custom kernel, or configuration, replace
# them in this section. # them in this section.
@@ -268,7 +260,7 @@ umount -l "${rootp}"
e2fsck -y -f "$rootp" e2fsck -y -f "$rootp"
# Remove loop devices # Remove loop devices
kpartx -dv "${loopdevice}" kpartx -dv "${loopdevice}"
losetup -d "${loopdevice}" losetup -d "${loopdevice}"
# Compress image compilation # Compress image compilation

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

@@ -189,14 +189,6 @@ systemd-nspawn_exec /third-stage
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
include sources.list
# Kernel section. If you want to use a custom kernel, or configuration, replace # Kernel section. If you want to use a custom kernel, or configuration, replace
# them in this section. # them in this section.
@@ -367,7 +359,7 @@ umount -l "${rootp}"
e2fsck -y -f "$rootp" e2fsck -y -f "$rootp"
# Remove loop devices # Remove loop devices
kpartx -dv "${loopdevice}" kpartx -dv "${loopdevice}"
losetup -d "${loopdevice}" losetup -d "${loopdevice}"
# Compress image compilation # Compress image compilation

10
nanopi-neo-plus2.sh
View File

@@ -203,14 +203,6 @@ systemd-nspawn_exec /third-stage
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# Kernel section. If you want to use a custom kernel, or configuration, replace # Kernel section. If you want to use a custom kernel, or configuration, replace
# them in this section. # them in this section.
@@ -381,7 +373,7 @@ umount -l "${rootp}"
e2fsck -y -f "$rootp" e2fsck -y -f "$rootp"
# Remove loop devices # Remove loop devices
kpartx -dv "${loopdevice}" kpartx -dv "${loopdevice}"
losetup -d "${loopdevice}" losetup -d "${loopdevice}"
# Compress image compilation # Compress image compilation

10
odroid-c2.sh
View File

@@ -130,14 +130,6 @@ systemd-nspawn_exec /third-stage
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# 1366x768 is sort of broken on the ODROID-C2, not sure where the issue is, but # 1366x768 is sort of broken on the ODROID-C2, not sure where the issue is, but
# we can work around it by setting the resolution to 1360x768. # we can work around it by setting the resolution to 1360x768.
@@ -274,7 +266,7 @@ umount -l "${rootp}"
e2fsck -y -f "$rootp" e2fsck -y -f "$rootp"
# Remove loop devices # Remove loop devices
kpartx -dv "${loopdevice}" kpartx -dv "${loopdevice}"
losetup -d "${loopdevice}" losetup -d "${loopdevice}"
# Compress image compilation # Compress image compilation

10
odroid-xu3.sh
View File

@@ -135,14 +135,6 @@ systemd-nspawn_exec /third-stage
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# Kernel section. If you want to use a custom kernel, or configuration, replace # Kernel section. If you want to use a custom kernel, or configuration, replace
# them in this section. # them in this section.
@@ -296,7 +288,7 @@ umount -l "${rootp}"
e2fsck -y -f "$rootp" e2fsck -y -f "$rootp"
# Remove loop devices # Remove loop devices
kpartx -dv "${loopdevice}" kpartx -dv "${loopdevice}"
losetup -d "${loopdevice}" losetup -d "${loopdevice}"
# Compress image compilation # Compress image compilation

10
pinebook-pro.sh
View File

@@ -127,14 +127,6 @@ systemd-nspawn_exec /third-stage
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# Pull in the wifi and bluetooth firmware from manjaro's git repository. # Pull in the wifi and bluetooth firmware from manjaro's git repository.
cd ${work_dir} cd ${work_dir}
@@ -323,7 +315,7 @@ umount -l "${rootp}"
e2fsck -y -f "$rootp" e2fsck -y -f "$rootp"
# Remove loop devices # Remove loop devices
kpartx -dv "${loopdevice}" kpartx -dv "${loopdevice}"
losetup -d "${loopdevice}" losetup -d "${loopdevice}"
# Compress image compilation # Compress image compilation

10
pinebook.sh
View File

@@ -194,14 +194,6 @@ systemd-nspawn_exec /third-stage
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# Set up some defaults for chromium, if the user ever installs it # Set up some defaults for chromium, if the user ever installs it
mkdir -p ${work_dir}/etc/chromium/ mkdir -p ${work_dir}/etc/chromium/
@@ -279,7 +271,7 @@ umount -l "${rootp}"
e2fsck -y -f "$rootp" e2fsck -y -f "$rootp"
# Remove loop devices # Remove loop devices
kpartx -dv "${loopdevice}" kpartx -dv "${loopdevice}"
losetup -d "${loopdevice}" losetup -d "${loopdevice}"
# Compress image compilation # Compress image compilation

10
rpi0w-nexmon-minimal.sh
View File

@@ -132,14 +132,6 @@ include rpi_firmware
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# systemd doesn't seem to be generating the fstab properly for some people, so let's create one. # systemd doesn't seem to be generating the fstab properly for some people, so let's create one.
cat <<EOF >"${work_dir}"/etc/fstab cat <<EOF >"${work_dir}"/etc/fstab
@@ -199,4 +191,4 @@ include compress_img
# Clean up all the temporary build stuff and remove the directories. # 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. # Comment this out to keep things around if you want to see what may have gone wrong.
clean_build clean_build

8
rpi0w-nexmon.sh
View File

@@ -137,14 +137,6 @@ include rpi_firmware
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# systemd doesn't seem to be generating the fstab properly for some people, so let's create one. # systemd doesn't seem to be generating the fstab properly for some people, so let's create one.
cat <<EOF >"${work_dir}"/etc/fstab cat <<EOF >"${work_dir}"/etc/fstab

8
rpi1.sh
View File

@@ -135,14 +135,6 @@ include rpi_firmware
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# systemd doesn't seem to be generating the fstab properly for some people, so let's create one. # systemd doesn't seem to be generating the fstab properly for some people, so let's create one.
cat <<EOF >"${work_dir}"/etc/fstab cat <<EOF >"${work_dir}"/etc/fstab

8
rpi3-64-minimal.sh
View File

@@ -135,14 +135,6 @@ include rpi_userland
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Reload sources.list
#include sources.list
# Mirror & suite replacement
restore_mirror
# systemd doesn't seem to be generating the fstab properly for some people, so let's create one. # systemd doesn't seem to be generating the fstab properly for some people, so let's create one.
cat <<EOF >"${work_dir}"/etc/fstab cat <<EOF >"${work_dir}"/etc/fstab

8
rpi3-64.sh
View File

@@ -136,14 +136,6 @@ include rpi_userland
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# systemd doesn't seem to be generating the fstab properly for some people, so let's create one. # systemd doesn't seem to be generating the fstab properly for some people, so let's create one.
cat <<EOF >"${work_dir}"/etc/fstab cat <<EOF >"${work_dir}"/etc/fstab

10
rpi3-nexmon.sh
View File

@@ -136,14 +136,6 @@ include rpi_firmware
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Reload sources.list
include sources.list
# Mirror & suite replacement
restore_mirror
# systemd doesn't seem to be generating the fstab properly for some people, so let's create one. # systemd doesn't seem to be generating the fstab properly for some people, so let's create one.
cat <<EOF >"${work_dir}"/etc/fstab cat <<EOF >"${work_dir}"/etc/fstab
@@ -207,4 +199,4 @@ include compress_img
# Clean up all the temporary build stuff and remove the directories. # 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. # Comment this out to keep things around if you want to see what may have gone wrong.
clean_build clean_build

9
usb-armory-mk2.sh
View File

@@ -160,14 +160,7 @@ systemd-nspawn_exec /third-stage
set_locale "$locale" set_locale "$locale"
# Clean system # Clean system
include clean_system include clean_system
# Define DNS server after last running systemd-nspawn.
echo "nameserver ${nameserver}" >"${work_dir}"/etc/resolv.conf
# Disable the use of http proxy in case it is enabled.
disable_proxy
# Mirror & suite replacement
restore_mirror
# Reload sources.list
#include sources.list
# Kernel section. If you want to use a custom kernel, or configuration, replace # Kernel section. If you want to use a custom kernel, or configuration, replace
# them in this section. # them in this section.