Reduce the amount of duplicate code (base_image)

banana-pi.sh

@@ -1,20 +1,12 @@
 #!/usr/bin/env bash
 #
 # Kali Linux ARM build-script for Banana Pi (32-bit)
-# Source: https://gitlab.com/kalilinux/build-scripts/kali-arm
+# https://gitlab.com/kalilinux/build-scripts/kali-arm
 #
-# This is a supported device - which you can find pre-generated images for: https://www.kali.org/get-kali/
+# This is a supported device - which you can find pre-generated images for
 # More information: https://www.kali.org/docs/arm/banana-pi/
 #
 
-# Stop on error
-set -e
-
-# shellcheck disable=SC2154
-# Load general functions
-# shellcheck source=/dev/null
-source ./common.d/functions.sh
-
 # Hardware model
 hw_model=${hw_model:-"banana-pi"}
 # Architecture
@@ -24,101 +16,21 @@ variant=${variant:-"${architecture}"}
 # Desktop manager (xfce, gnome, i3, kde, lxde, mate, e17 or none)
 desktop=${desktop:-"xfce"}
 
-# Load common variables
-include variables
-# Checks script environment
-include check
-# Packages build list
-include packages
-# Execute initial debootstrap
-debootstrap_exec http://http.kali.org/kali
-# Enable eatmydata in compilation
-include eatmydata
-# debootstrap second stage
-systemd-nspawn_exec eatmydata /debootstrap/debootstrap --second-stage
-# Define sources.list
-include sources.list
-# APT options
-include apt_options
-# So X doesn't complain, we add kali to hosts
-include hosts
-# Set hostname
-set_hostname "${hostname}"
+# Load default base_image configs
+source ./common.d/base_image.sh
+
 # Network configs
 include network
 add_interface eth0
 
-# Copy directory bsp into build dir
-status "Copy directory bsp into build dir"
-cp -rp bsp "${work_dir}"
-
 # Third stage
-cat <<EOF > "${work_dir}"/third-stage
-#!/usr/bin/env bash
-set -e
-status_3i=0
-status_3t=\$(grep '^status_stage3 ' \$0 | wc -l)
-
-status_stage3() {
-  status_3i=\$((status_3i+1))
-  echo  " [i] Stage 3 (\${status_3i}/\${status_3t}): \$1"
-}
-
-status_stage3 'Update apt'
-export DEBIAN_FRONTEND=noninteractive
-eatmydata apt-get update
-
-status_stage3 'Install core packages'
-eatmydata apt-get -y install ${third_stage_pkgs}
-
-status_stage3 'Install packages'
-eatmydata apt-get install -y ${packages} || eatmydata apt-get install -y --fix-broken
-
-status_stage3 'Install desktop packages'
-eatmydata apt-get install -y ${desktop_pkgs} ${extra} || eatmydata apt-get install -y --fix-broken
-
-status_stage3 'ntp doesn't always sync the date, but systemd's timesyncd does, so we remove ntp and reinstall it with this'
-eatmydata apt-get install -y systemd-timesyncd --autoremove
-
-status_stage3 'Clean up'
-eatmydata apt-get -y --purge autoremove
-
-status_stage3 'Linux console/keyboard configuration'
-echo 'console-common console-data/keymap/policy select Select keymap from full list' | debconf-set-selections
-echo 'console-common console-data/keymap/full select en-latin1-nodeadkeys' | debconf-set-selections
-
-status_stage3 'Copy all services'
-cp -p /bsp/services/all/*.service /etc/systemd/system/
+cat <<EOF >> "${work_dir}"/third-stage
+status_stage3 'Copy rpi services'
 cp -p /bsp/services/rpi/*.service /etc/systemd/system/
 
 status_stage3 'Install the kernel packages'
 eatmydata apt-get install -y linux-image-armmp u-boot-menu u-boot-sunxi
 
-status_stage3 'Regenerated the shared-mime-info database on the first boot since it fails to do so properly in a chroot'
-systemctl enable smi-hack
-
-status_stage3 'Copy script rpi-resizerootfs'
-install -m755 /bsp/scripts/rpi-resizerootfs /usr/sbin/
-install -m755 /bsp/scripts/growpart /usr/local/bin/
-
-status_stage3 'Enable rpi-resizerootfs first boot'
-systemctl enable rpi-resizerootfs
-
-status_stage3 'Generate SSH host keys on first run'
-systemctl enable regenerate_ssh_host_keys
-
-status_stage3 'Enable ssh'
-systemctl enable ssh
-
-status_stage3 'Allow users to use NetworkManager over ssh'
-install -m644 /bsp/polkit/10-NetworkManager.pkla /var/lib/polkit-1/localauthority/50-local.d
-
-status_stage3 'Set a REGDOMAIN'
-sed -i -e 's/REGDOM.*/REGDOMAIN=00/g' /etc/default/crda
-
-status_stage3 'Enable login over serial'
-echo "T0:23:respawn:/sbin/agetty -L ttyS0 115200 vt100" >> /etc/inittab
-
 status_stage3 'Load the ethernet module since it does not load automatically at boot'
 echo "sunxi_emac" >> /etc/modules
 
@@ -126,27 +38,12 @@ status_stage3 'Create xorg config snippet to use fbdev driver'
 mkdir -p /etc/X11/xorg.conf.d/
 cp /bsp/xorg/20-fbdev.conf /etc/X11/xorg.conf.d/
 
-status_stage3 'Try and make the console a bit nicer. Set the terminus font for a bit nicer display'
-sed -i -e 's/FONTFACE=.*/FONTFACE="Terminus"/' /etc/default/console-setup
-sed -i -e 's/FONTSIZE=.*/FONTSIZE="6x12"/' /etc/default/console-setup
-
-status_stage3 'Fix startup time from 5 minutes to 15 secs on raise interface wlan0'
-sed -i 's/^TimeoutStartSec=5min/TimeoutStartSec=15/g' "/usr/lib/systemd/system/networking.service"
-
-status_stage3 'Enable runonce'
-install -m755 /bsp/scripts/runonce /usr/sbin/
-cp -rf /bsp/runonce.d /etc
-systemctl enable runonce
-
-status_stage3 'Clean up dpkg.eatmydata'
-rm -f /usr/bin/dpkg
-dpkg-divert --remove --rename /usr/bin/dpkg
+status_stage3 'Enable login over serial (No password)'
+echo "T0:23:respawn:/sbin/agetty -L ttyS0 115200 vt100" >> /etc/inittab
 EOF
 
 # Run third stage
-chmod 0755 "${work_dir}"/third-stage
-status "Run third stage"
-systemd-nspawn_exec /third-stage
+include third_stage
 
 # Clean system
 include clean_system
@@ -176,8 +73,8 @@ mkfs -O "$features" -t "$fstype" -L ROOTFS "${rootp}"
 
 # Create the dirs for the partitions and mount them
 status "Create the dirs for the partitions and mount them"
-mkdir -p ${base_dir}/root
-mount ${rootp} ${base_dir}/root
+mkdir -p "${base_dir}"/root
+mount ${rootp} "${base_dir}"/root
 
 # Create an fstab so that we don't mount / read-only
 status "Fix rootfs entry in /etc/fstab"
@@ -195,36 +92,12 @@ status "Set the default options in /etc/default/u-boot"
 echo 'U_BOOT_MENU_LABEL="Kali Linux"' >> ${work_dir}/etc/default/u-boot
 echo 'U_BOOT_PARAMETERS="console=tty1 consoleblank=0 ro rootwait"' >> ${work_dir}/etc/default/u-boot
 
-status "Rsyncing rootfs to image file"
+status "Rsyncing rootfs into image file"
 rsync -HPavz -q ${work_dir}/ ${base_dir}/root/
 sync
 
-# Flush buffers and bytes - this is nicked from the Devuan arm-sdk
-blockdev --flushbufs "${loopdevice}"
-python3 -c 'import os; os.fsync(open("'${loopdevice}'", "r+b"))'
-
-# Unmount filesystem
-status "Unmount filesystem"
-umount -l "${rootp}"
-
+status "dd to ${loopdevice} (u-boot bootloader)"
 dd if=${work_dir}/usr/lib/u-boot/Bananapi/u-boot-sunxi-with-spl.bin of=${loopdevice} bs=1024 seek=8
 
-# Check filesystem
-status "Check filesystem"
-e2fsck -y -f "${rootp}"
-
-# Remove loop devices
-status "Remove loop devices"
-kpartx -dv "${loopdevice}"
-losetup -d "${loopdevice}"
-
-# Compress image compilation
-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
-
-# Quit
-log "Done" green
-exit 0
+# Load default finish_image configs
+include finish_image