Clean up on break out

2021-09-17 16:47:51 +01:00
parent 8f9f524e78
commit bd9b443dc9
18 changed files with 18 additions and 0 deletions
--- a/banana-pi.sh
+++ b/banana-pi.sh
@@ -137,6 +137,7 @@ systemd-nspawn_exec /third-stage
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/banana-pro.sh
+++ b/banana-pro.sh
@@ -137,6 +137,7 @@ systemd-nspawn_exec /third-stage
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/gateworks-newport.sh
+++ b/gateworks-newport.sh
@@ -130,6 +130,7 @@ systemd-nspawn_exec /third-stage
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/gateworks-ventana.sh
+++ b/gateworks-ventana.sh
@@ -128,6 +128,7 @@ systemd-nspawn_exec /third-stage
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/nanopc-t.sh
+++ b/nanopc-t.sh
@@ -130,6 +130,7 @@ systemd-nspawn_exec /third-stage
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/nanopi-neo-plus2-minimal.sh
+++ b/nanopi-neo-plus2-minimal.sh
@@ -201,6 +201,7 @@ systemd-nspawn_exec /third-stage
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/nanopi-neo-plus2.sh
+++ b/nanopi-neo-plus2.sh
@@ -215,6 +215,7 @@ systemd-nspawn_exec /third-stage
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/odroid-c2.sh
+++ b/odroid-c2.sh
@@ -142,6 +142,7 @@ systemd-nspawn_exec /third-stage
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/odroid-xu3.sh
+++ b/odroid-xu3.sh
@@ -147,6 +147,7 @@ systemd-nspawn_exec /third-stage
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/pinebook-pro.sh
+++ b/pinebook-pro.sh
@@ -139,6 +139,7 @@ systemd-nspawn_exec /third-stage
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/pinebook.sh
+++ b/pinebook.sh
@@ -206,6 +206,7 @@ systemd-nspawn_exec /third-stage
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/rpi-64bit-minimal.sh
+++ b/rpi-64bit-minimal.sh
@@ -154,6 +154,7 @@ include rpi_userland
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/rpi-64bit.sh
+++ b/rpi-64bit.sh
@@ -148,6 +148,7 @@ include rpi_userland
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/rpi.sh
+++ b/rpi.sh
@@ -148,6 +148,7 @@ include rpi_firmware
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/rpi0w-minimal.sh
+++ b/rpi0w-minimal.sh
@@ -144,6 +144,7 @@ include rpi_firmware
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/rpi0w.sh
+++ b/rpi0w.sh
@@ -149,6 +149,7 @@ include rpi_firmware
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/rpi1.sh
+++ b/rpi1.sh
@@ -147,6 +147,7 @@ include rpi_firmware
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled
--- a/usb-armory-mkii.sh
+++ b/usb-armory-mkii.sh
@@ -172,6 +172,7 @@ systemd-nspawn_exec /third-stage
 set_locale "$locale"
 # Clean system
 include clean_system
+trap clean_build ERR SIGTERM SIGINT
 # Define DNS server after last running systemd-nspawn
 echo "nameserver 8.8.8.8" >"${work_dir}"/etc/resolv.conf
 # Disable the use of http proxy in case it is enabled