From 8df66aa7b84b27bbc9905d62ef3a8f865df253a4 Mon Sep 17 00:00:00 2001
From: Steev Klimaszewski <steev@kali.org>
Date: Fri, 22 Jun 2018 20:38:19 -0500
Subject: [PATCH] Update rpi2 and formatting changes.

While we don't release an rpi2 specific build, there are still people
out there that build their own because they don't want to use Nexmon.
This updates the rpi2 script to keep up with the changes for the rpi3
while leaving out nexmon/rpi3 bluetooth bits.

Also update chmod because we don't need it.
---
 banana-pro.sh            |   8 +-
 bbb.sh                   |   6 +-
 chromebook-arm-acer.sh   |   8 +-
 chromebook-arm-exynos.sh |   8 +-
 chromebook-arm-veyron.sh |   8 +-
 cubieboard2.sh           |   8 +-
 cubietruck.sh            |   8 +-
 cubox-i.sh               |   8 +-
 cubox.sh                 |   8 +-
 efikamx.sh               |   6 +-
 kalitap.sh               |   6 +-
 luna.sh                  |   6 +-
 mini-x.sh                |   8 +-
 nanopi2.sh               |   8 +-
 nanopi3.sh               |   8 +-
 odroid-c.sh              |  10 +-
 odroid-c2.sh             |  16 +--
 odroid-u2.sh             |   8 +-
 odroid-w-devkit.sh       |   8 +-
 odroid-w.sh              |   8 +-
 odroid-xu.sh             |   8 +-
 odroid-xu3.sh            |   8 +-
 riot.sh                  | 304 ---------------------------------------
 rpi-tft.sh               |   8 +-
 rpi.sh                   |   6 +-
 rpi0w-nexmon-p4wnp1.sh   |  18 +--
 rpi0w-nexmon.sh          |  14 +-
 rpi2.sh                  | 105 +++++++++-----
 rpi3-nexmon.sh           |  18 +--
 usbarmory.sh             |   8 +-
 utilite.sh               |   8 +-
 31 files changed, 198 insertions(+), 469 deletions(-)
 delete mode 100755 riot.sh

diff --git a/banana-pro.sh b/banana-pro.sh
index 710a7d2..e3df3f0 100755
--- a/banana-pro.sh
+++ b/banana-pro.sh
@@ -105,7 +105,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -137,7 +137,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M bpro -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -151,7 +151,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M bpro -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -269,7 +269,7 @@ dd if=u-boot-sunxi-with-spl.bin of=$loopdevice bs=1024 seek=8
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/bbb.sh b/bbb.sh
index 6b173f5..2554ac9 100755
--- a/bbb.sh
+++ b/bbb.sh
@@ -139,7 +139,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -177,7 +177,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M bbb -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -191,7 +191,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M bbb -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
diff --git a/chromebook-arm-acer.sh b/chromebook-arm-acer.sh
index 598f3ef..d83d400 100755
--- a/chromebook-arm-acer.sh
+++ b/chromebook-arm-acer.sh
@@ -106,7 +106,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -135,7 +135,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M nyan -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -149,7 +149,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M nyan -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -450,7 +450,7 @@ cp src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.fw ${basedir}/root/lib/firmware/
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/chromebook-arm-exynos.sh b/chromebook-arm-exynos.sh
index e35f1d5..e8c1246 100755
--- a/chromebook-arm-exynos.sh
+++ b/chromebook-arm-exynos.sh
@@ -106,7 +106,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -135,7 +135,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M exynos -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -149,7 +149,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M exynos -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -531,7 +531,7 @@ ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="isl29018", RUN+="light-sensor-set-
 EOF
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 rm -rf ${basedir}/root/lib/firmware
 cd ${basedir}/root/lib
diff --git a/chromebook-arm-veyron.sh b/chromebook-arm-veyron.sh
index 563d62e..a082471 100755
--- a/chromebook-arm-veyron.sh
+++ b/chromebook-arm-veyron.sh
@@ -104,7 +104,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -133,7 +133,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M veyron -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -147,7 +147,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M veyron -D kali-$architecture /cleanup
 
 cat << EOF > kali-$architecture/etc/resolv.conf
@@ -2369,7 +2369,7 @@ EndSection
 EOF
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 # Copy the broadcom firmware files in (for now) - once sources are released,
 # will be able to do this without having a local copy.
diff --git a/cubieboard2.sh b/cubieboard2.sh
index 3bd362e..e14da9f 100755
--- a/cubieboard2.sh
+++ b/cubieboard2.sh
@@ -103,7 +103,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -132,7 +132,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M cubieboard2 -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -146,7 +146,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M cubieboard2 -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -259,7 +259,7 @@ rm -rf ${basedir}/root/lib/firmware/.git
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/cubietruck.sh b/cubietruck.sh
index 39c298e..e350907 100755
--- a/cubietruck.sh
+++ b/cubietruck.sh
@@ -103,7 +103,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -132,7 +132,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M cubietruck -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -146,7 +146,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M cubietruck -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -260,7 +260,7 @@ rm -rf ${basedir}/root/lib/firmware/.git
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/cubox-i.sh b/cubox-i.sh
index 5c8a012..25cd326 100755
--- a/cubox-i.sh
+++ b/cubox-i.sh
@@ -118,7 +118,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-changes-held-packages install locales-all
@@ -150,7 +150,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M cubox-i -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -164,7 +164,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M cubox-i -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -283,7 +283,7 @@ dd if=u-boot.img of=$loopdevice bs=1K seek=42
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/cubox.sh b/cubox.sh
index a6cd206..c7f37a4 100755
--- a/cubox.sh
+++ b/cubox.sh
@@ -103,7 +103,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -132,7 +132,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M cubox -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -146,7 +146,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M cubox -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -262,7 +262,7 @@ rm -rf ${basedir}/root/lib/firmware/.git
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/efikamx.sh b/efikamx.sh
index 62d7dae..4c6098f 100755
--- a/efikamx.sh
+++ b/efikamx.sh
@@ -112,7 +112,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get install locales-all
@@ -137,7 +137,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M efikamx -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -153,7 +153,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M efikamx -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
diff --git a/kalitap.sh b/kalitap.sh
index bda34a7..ed306cf 100755
--- a/kalitap.sh
+++ b/kalitap.sh
@@ -98,7 +98,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -135,7 +135,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M kalitap -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -149,7 +149,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M kalitap -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
diff --git a/luna.sh b/luna.sh
index afd5e60..9a25596 100755
--- a/luna.sh
+++ b/luna.sh
@@ -96,7 +96,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get install --yes --allow-change-held-packages locales-all
@@ -121,7 +121,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M luna -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -135,7 +135,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M luna -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
diff --git a/mini-x.sh b/mini-x.sh
index 6bdfb16..9d8203c 100755
--- a/mini-x.sh
+++ b/mini-x.sh
@@ -103,7 +103,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -132,7 +132,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M mini-x -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -146,7 +146,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M mini-x -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -253,7 +253,7 @@ rm -rf ${basedir}/root/lib/firmware/.git
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/nanopi2.sh b/nanopi2.sh
index ebb00d4..02c98ed 100755
--- a/nanopi2.sh
+++ b/nanopi2.sh
@@ -113,7 +113,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -148,7 +148,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M nanopi2 -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -162,7 +162,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M nanopi2 -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -299,7 +299,7 @@ ln -s /usr/src/kernel source
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/nanopi3.sh b/nanopi3.sh
index dd8078f..dc51eae 100755
--- a/nanopi3.sh
+++ b/nanopi3.sh
@@ -113,7 +113,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -148,7 +148,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M nanopi3 -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -162,7 +162,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M nanopi3 -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -305,7 +305,7 @@ ln -s /usr/src/kernel source
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/odroid-c.sh b/odroid-c.sh
index c260d68..fe220ca 100755
--- a/odroid-c.sh
+++ b/odroid-c.sh
@@ -106,7 +106,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -143,7 +143,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M odroidc -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -157,7 +157,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M odroidc -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -443,7 +443,7 @@ echo 7 > /sys/class/net/eth0/queues/tx-0/xps_cpus
 # Move IRQ's of ethernet to CPU1/2
 echo 1,2 > /proc/irq/40/smp_affinity_list
 EOF
-chmod +x ${basedir}/root/usr/bin/amlogic.sh
+chmod 755 ${basedir}/root/usr/bin/amlogic.sh
 
 cat << EOF > ${basedir}/root/etc/sysctl.d/99-c1-network.conf
 net.core.rmem_max = 26214400
@@ -468,7 +468,7 @@ rm -rf ${basedir}/root/lib/firmware/.git
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/odroid-c2.sh b/odroid-c2.sh
index 1a6880b..a4e7916 100755
--- a/odroid-c2.sh
+++ b/odroid-c2.sh
@@ -131,7 +131,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -169,7 +169,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M odroidc2 -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -183,7 +183,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M odroidc2 -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -234,7 +234,7 @@ cat << EOF > ${basedir}/root/usr/bin/aml_fix_display
 #!/bin/bash
 exit 0
 EOF
-chmod +x ${basedir}/root/usr/bin/aml_fix_display
+chmod 755 ${basedir}/root/usr/bin/aml_fix_display
 
 # Create systemd service to setup display.
 cat << EOF > ${basedir}/root/lib/systemd/system/amlogic.service
@@ -383,7 +383,7 @@ common_display_setup
 echo 0 > /sys/class/graphics/fb0/blank
 echo 0 > /sys/class/graphics/fb1/blank
 EOF
-chmod +x ${basedir}/root/usr/bin/amlogic.sh
+chmod 755 ${basedir}/root/usr/bin/amlogic.sh
 
 # And because we need to run c2_init in the initramfs and it calls fbset,
 # create a hook for adding /bin/fbset to the initrd as well.
@@ -396,7 +396,7 @@ case \$1 in
         . /usr/share/initramfs-tools/hook-functions
         copy_exec /bin/fbset /bin
 EOF
-chmod +x ${basedir}/root/usr/share/initramfs-tools/hooks/fbset
+chmod 755 ${basedir}/root/usr/share/initramfs-tools/hooks/fbset
 
 # Uncomment this if you use apt-cacher-ng otherwise git clones will fail.
 #unset http_proxy
@@ -613,7 +613,7 @@ rm -rf ${basedir}/root/lib/firmware/.git
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 # Now, to get display working properly, we need an initramfs, so we can run the
 # c2_init.sh file before we launch X.
@@ -628,7 +628,7 @@ mkimage -A arm64 -O linux -T ramdisk -C none -a 0 -e 0 -n "uInitrd" -d /boot/ini
 rm -f /create-initrd
 rm -f /usr/bin/qemu-*
 EOF
-chmod +x ${basedir}/root/create-initrd
+chmod 755 ${basedir}/root/create-initrd
 LANG=C systemd-nspawn -M odroidc2 -D ${basedir}/root /create-initrd
 umount ${basedir}/root/boot
 
diff --git a/odroid-u2.sh b/odroid-u2.sh
index 6fc6551..85ba9e5 100755
--- a/odroid-u2.sh
+++ b/odroid-u2.sh
@@ -106,7 +106,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -135,7 +135,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M odroidu2 -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -149,7 +149,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M odroidu2 -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -300,7 +300,7 @@ rm -rf ${basedir}/root/lib/firmware/.git
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/odroid-w-devkit.sh b/odroid-w-devkit.sh
index a8baffa..603a276 100755
--- a/odroid-w-devkit.sh
+++ b/odroid-w-devkit.sh
@@ -105,7 +105,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -137,7 +137,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M devkit -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -151,7 +151,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M devkit -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -314,7 +314,7 @@ EOF
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/odroid-w.sh b/odroid-w.sh
index 0832971..c49ba6c 100755
--- a/odroid-w.sh
+++ b/odroid-w.sh
@@ -105,7 +105,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -136,7 +136,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M odroidw -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -150,7 +150,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M odroidw -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -250,7 +250,7 @@ chmod 755 ${basedir}/root/scripts/rpi-wiggle.sh
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/odroid-xu.sh b/odroid-xu.sh
index ea179da..60bfe92 100755
--- a/odroid-xu.sh
+++ b/odroid-xu.sh
@@ -129,7 +129,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -162,7 +162,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M odroidxu -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -176,7 +176,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M odroidxu -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -329,7 +329,7 @@ rm -rf ${basedir}/root/lib/firmware/.git
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/odroid-xu3.sh b/odroid-xu3.sh
index f501f15..514127a 100755
--- a/odroid-xu3.sh
+++ b/odroid-xu3.sh
@@ -126,7 +126,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -158,7 +158,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M odroidxu3 -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -172,7 +172,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M odroidxu3 -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -324,7 +324,7 @@ rm -rf ${basedir}/root/lib/firmware/.git
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/riot.sh b/riot.sh
deleted file mode 100755
index fcc2619..0000000
--- a/riot.sh
+++ /dev/null
@@ -1,304 +0,0 @@
-#!/bin/bash
-
-# This is the riot Kali ARM build script - http://www.riotboard.org
-# A trusted Kali Linux image created by Offensive Security - http://www.offensive-security.com
-
-if [[ $# -eq 0 ]] ; then
-    echo "Please pass version number, e.g. $0 2.0"
-    exit 0
-fi
-
-basedir=`pwd`/riot-$1
-
-# Make sure that the cross compiler can be found in the path before we do
-# anything else, that way the builds don't fail half way through.
-export CROSS_COMPILE=arm-linux-gnueabihf-
-if [ $(compgen -c $CROSS_COMPILE | wc -l) -eq 0 ] ; then
-    echo "Missing cross compiler. Set up PATH according to the README"
-    exit 1
-fi
-# Unset CROSS_COMPILE so that if there is any native compiling needed it doesn't
-# get cross compiled.
-unset CROSS_COMPILE
-
-# Package installations for various sections. 
-# This will build a minimal XFCE Kali system with the top 10 tools.
-# This is the section to edit if you would like to add more packages.
-# See http://www.kali.org/new/kali-linux-metapackages/ for meta packages you can
-# use. You can also install packages, using just the package name, but keep in
-# mind that not all packages work on ARM! If you specify one of those, the
-# script will throw an error, but will still continue on, and create an unusable
-# image, keep that in mind.
-
-arm="abootimg cgpt fake-hwclock ntpdate u-boot-tools vboot-utils vboot-kernel-utils"
-base="e2fsprogs initramfs-tools kali-defaults kali-menu parted sudo usbutils"
-desktop="fonts-croscore fonts-crosextra-caladea fonts-crosextra-carlito gnome-theme-kali gtk3-engines-xfce kali-desktop-xfce kali-root-login lightdm network-manager network-manager-gnome xfce4 xserver-xorg-video-fbdev"
-tools="aircrack-ng ethtool hydra john libnfc-bin mfoc nmap passing-the-hash sqlmap usbutils winexe wireshark"
-services="apache2 openssh-server"
-extras="iceweasel xfce4-terminal wpasupplicant"
-
-packages="${arm} ${base} ${desktop} ${tools} ${services} ${extras}"
-architecture="armhf"
-# If you have your own preferred mirrors, set them here.
-# After generating the rootfs, we set the sources.list to the default settings.
-mirror=http.kali.org
-
-# Set this to use an http proxy, like apt-cacher-ng, and uncomment further down
-# to unset it.
-#export http_proxy="http://localhost:3142/"
-
-mkdir -p ${basedir}
-cd ${basedir}
-
-# create the rootfs - not much to modify here, except maybe the hostname.
-debootstrap --foreign --arch $architecture kali-rolling kali-$architecture http://$mirror/kali
-
-cp /usr/bin/qemu-arm-static kali-$architecture/usr/bin/
-
-LANG=C systemd-nspawn -M riot -D kali-$architecture /debootstrap/debootstrap --second-stage
-cat << EOF > kali-$architecture/etc/apt/sources.list
-deb http://$mirror/kali kali-rolling main contrib non-free
-EOF
-
-# Set hostname
-echo "kali" > kali-$architecture/etc/hostname
-
-cat << EOF > kali-$architecture/etc/hosts
-127.0.0.1       kali    localhost
-::1             localhost ip6-localhost ip6-loopback
-fe00::0         ip6-localnet
-ff00::0         ip6-mcastprefix
-ff02::1         ip6-allnodes
-ff02::2         ip6-allrouters
-EOF
-
-cat << EOF > kali-$architecture/etc/network/interfaces
-auto lo
-iface lo inet loopback
-
-auto eth0
-iface eth0 inet dhcp
-EOF
-
-cat << EOF > kali-$architecture/etc/resolv.conf
-nameserver 8.8.8.8
-EOF
-
-export MALLOC_CHECK_=0 # workaround for LP: #520465
-export LC_ALL=C
-export DEBIAN_FRONTEND=noninteractive
-
-#mount -t proc proc kali-$architecture/proc
-#mount -o bind /dev/ kali-$architecture/dev/
-#mount -o bind /dev/pts kali-$architecture/dev/pts
-
-cat << EOF > kali-$architecture/debconf.set
-console-common console-data/keymap/policy select Select keymap from full list
-console-common console-data/keymap/full select en-latin1-nodeadkeys
-EOF
-
-cat << EOF > kali-$architecture/third-stage
-#!/bin/bash
-dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
-cp /bin/true /usr/sbin/invoke-rc.d
-echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
-
-apt-get update
-apt-get --yes --allow-change-held-packages install locales-all
-
-debconf-set-selections /debconf.set
-rm -f /debconf.set
-apt-get update
-apt-get -y install git-core binutils ca-certificates initramfs-tools u-boot-tools
-apt-get -y install locales console-common less nano git
-echo "root:toor" | chpasswd
-sed -i -e 's/KERNEL\!=\"eth\*|/KERNEL\!=\"/' /lib/udev/rules.d/75-persistent-net-generator.rules
-rm -f /etc/udev/rules.d/70-persistent-net.rules
-export DEBIAN_FRONTEND=noninteractive
-apt-get --yes --allow-change-held-packages install $packages
-if [ $? > 0 ];
-then
-    apt-get --yes --allow-change-held-packages --fix-broken install
-fi
-apt-get --yes --allow-change-held-packages dist-upgrade
-apt-get --yes --allow-change-held-packages autoremove
-
-# Because copying in authorized_keys is hard for people to do, let's make the
-# image insecure and enable root login with a password.
-
-sed -i -e 's/^#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-update-rc.d ssh enable
-
-rm -f /usr/sbin/policy-rc.d
-rm -f /usr/sbin/invoke-rc.d
-dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
-
-rm -f /third-stage
-EOF
-
-chmod +x kali-$architecture/third-stage
-LANG=C systemd-nspawn -M riot -D kali-$architecture /third-stage
-
-cat << EOF > kali-$architecture/cleanup
-#!/bin/bash
-rm -rf /root/.bash_history
-apt-get update
-apt-get clean
-rm -f /0
-rm -f /hs_err*
-rm -f cleanup
-rm -f /usr/bin/qemu*
-EOF
-
-chmod +x kali-$architecture/cleanup
-LANG=C systemd-nspawn -M riot -D kali-$architecture /cleanup
-
-#umount kali-$architecture/proc/sys/fs/binfmt_misc
-#umount kali-$architecture/dev/pts
-#umount kali-$architecture/dev/
-#umount kali-$architecture/proc
-
-# Create the disk and partition it
-echo "Creating image file for riot"
-dd if=/dev/zero of=${basedir}/kali-linux-$1-riot.img bs=1M count=7000
-parted kali-linux-$1-riot.img --script -- mklabel msdos
-parted kali-linux-$1-riot.img --script -- mkpart primary fat32 2048s 264191s
-parted kali-linux-$1-riot.img --script -- mkpart primary ext4 264192s 100%
-
-# Set the partition variables
-loopdevice=`losetup -f --show ${basedir}/kali-linux-$1-riot.img`
-device=`kpartx -va $loopdevice| sed -E 's/.*(loop[0-9])p.*/\1/g' | head -1`
-sleep 5
-device="/dev/mapper/${device}"
-bootp=${device}p1
-rootp=${device}p2
-
-# Create file systems
-mkfs.vfat $bootp
-mkfs.ext4 $rootp
-
-# Create the dirs for the partitions and mount them
-mkdir -p ${basedir}/bootp ${basedir}/root
-mount $bootp ${basedir}/bootp
-mount $rootp ${basedir}/root
-
-echo "Rsyncing rootfs into image file"
-rsync -HPavz -q ${basedir}/kali-$architecture/ ${basedir}/root/
-
-# Enable serial console access
-echo "T1:23:respawn:/sbin/agetty -L ttymxc1 115200 vt100" >> ${basedir}/root/etc/inittab
-
-cat << EOF >> ${basedir}/root/etc/udev/links.conf
-M   ttymxc1 c   5 1
-EOF
-
-cat << EOF >> ${basedir}/root/etc/securetty
-ttymxc1
-EOF
-
-cat << EOF > ${basedir}/root/etc/apt/sources.list
-deb http://http.kali.org/kali kali-rolling main non-free contrib
-deb-src http://http.kali.org/kali kali-rolling main non-free contrib
-EOF
-
-# Uncomment this if you use apt-cacher-ng otherwise git clones will fail
-#unset http_proxy
-
-# Kernel section. If you want to use a custom kernel, or configuration, replace
-# them in this section.
-git clone --depth 1 git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git -b linux-4.4.y ${basedir}/root/usr/src/kernel
-cd ${basedir}/root/usr/src/kernel
-git rev-parse HEAD > ../kernel-at-commit
-patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/kali-wifi-injection-4.4.patch
-patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/0001-wireless-carl9170-Enable-sniffer-mode-promisc-flag-t.patch
-touch .scmversion
-export ARCH=arm
-export CROSS_COMPILE=arm-linux-gnueabihf-
-cp ${basedir}/../kernel-configs/riot.config .config
-cp ${basedir}/../kernel-configs/riot.config ../riot.config
-make -j $(grep -c processor /proc/cpuinfo)
-make modules_install INSTALL_MOD_PATH=${basedir}/root
-cp arch/arm/boot/zImage ${basedir}/bootp/
-cp arch/arm/boot/dts/imx6dl-riotboard.dtb ${basedir}/bootp/
-cd ${basedir}
-
-rm -rf ${basedir}/root/lib/firmware
-cd ${basedir}/root/lib
-git clone --depth 1 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git firmware
-rm -rf ${basedir}/root/lib/firmware/.git
-# Need some firmware from the kernel so..
-cd ${basedir}/root/usr/src/kernel
-make firmware_install INSTALL_MOD_PATH=${basedir}/root
-make mrproper
-cp ../riot.config .config
-make modules_prepare
-cd ${basedir}
-
-# Fix up the symlink for building external modules
-# kernver is used so we don't need to keep track of what the current compiled
-# version is
-kernver=$(ls ${basedir}/root/lib/modules/)
-cd ${basedir}/root/lib/modules/$kernver
-rm build
-rm source
-ln -s /usr/src/kernel build
-ln -s /usr/src/kernel source
-cd ${basedir}
-
-# Mainline u-boot with RIoTboard fixes on top
-wget ftp://ftp.denx.de/pub/u-boot/u-boot-2018.05.tar.bz2
-tar -xf u-boot-2018.05.tar.bz2
-cd u-boot-2018.05
-make riotboard_config
-make -j $(grep -c processor /proc/cpuinfo)
-dd if=u-boot.imx of=$loopdevice bs=1024 seek=1
-cd ${basedir}
-
-# Generate the bootscript so that u-boot knows where everything is...
-cat << __EOF__ > ${basedir}/bootp/bootscript
-fdt_high=0xffffffff
-initrd_high=0xffffffff
-
-kaddr=0x12000000
-
-loadkernel=load \${dtype} \${disk}:1 \${loadaddr} zImage
-
-bargs=setenv bootargs console=ttymxc1,115200n8 rootwait root=PARTUUID=\${btpart} net.ifnames=0 rootfstype=ext4
-
-loadfdt=load \${dtype} \${disk}:1 0x11000000 \${fdt_file}
-
-doboot=part uuid \${dtype} \${disk}:2 btpart ; run bargs; if run loadkernel; then echo kernel_loaded ; if run loadfdt; then echo fdt_loaded; bootz \${loadaddr} - 0x11000000 ; else echo fail1 ; fi ; fi ; echo failed to boot
-__EOF__
-
-cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
-
-sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
-
-# Unmount partitions
-umount $bootp
-umount $rootp
-kpartx -dv $loopdevice
-losetup -d $loopdevice
-
-# 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.
-echo "Removing temporary build files"
-rm -rf ${basedir}/kernel ${basedir}/bootp ${basedir}/root ${basedir}/kali-$architecture ${basedir}/boot ${basedir}/u-boot* ${basedir}/patches
-
-# If you're building an image for yourself, comment all of this out, as you
-# don't need the sha256sum or to compress the image, since you will be testing it
-# soon.
-echo "Generating sha256sum for kali-linux-$1-riot.img"
-sha256sum kali-linux-$1-riot.img > ${basedir}/kali-linux-$1-riot.img.sha256sum
-# Don't pixz on 32bit, there isn't enough memory to compress the images.
-MACHINE_TYPE=`uname -m`
-if [ ${MACHINE_TYPE} == 'x86_64' ]; then
-echo "Compressing kali-linux-$1-riot.img"
-pixz ${basedir}/kali-linux-$1-riot.img ${basedir}/kali-linux-$1-riot.img.xz
-rm ${basedir}/kali-linux-$1-riot.img
-echo "Generating sha256sum for kali-linux-$1-riot.img.xz"
-sha256sum kali-linux-$1-riot.img.xz > ${basedir}/kali-linux-$1-riot.img.xz.sha256sum
-fi
diff --git a/rpi-tft.sh b/rpi-tft.sh
index 8a94af4..72d67b8 100755
--- a/rpi-tft.sh
+++ b/rpi-tft.sh
@@ -135,7 +135,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -176,7 +176,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M rpitft -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -190,7 +190,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M rpitft -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -334,7 +334,7 @@ chmod 755 ${basedir}/root/root/scripts/rpi-wiggle.sh
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/rpi.sh b/rpi.sh
index dd12d47..a773711 100755
--- a/rpi.sh
+++ b/rpi.sh
@@ -142,7 +142,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -198,7 +198,7 @@ export DEBIAN_FRONTEND=noninteractive
 #mount -o bind /dev/ kali-$architecture/dev/
 #mount -o bind /dev/pts kali-$architecture/dev/pts
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 
 if LANG=C systemd-nspawn -M rpi -D kali-$architecture /third-stage
 then
@@ -313,7 +313,7 @@ chmod 755 ${basedir}/root/root/scripts/rpi-wiggle.sh
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 # Unmount partitions
 # Sync before unmounting to ensure everything is written
diff --git a/rpi0w-nexmon-p4wnp1.sh b/rpi0w-nexmon-p4wnp1.sh
index 71fe6c4..20efbe5 100755
--- a/rpi0w-nexmon-p4wnp1.sh
+++ b/rpi0w-nexmon-p4wnp1.sh
@@ -106,14 +106,14 @@ cat << EOF > kali-$architecture/usr/bin/monstart
 echo "Nexutil setting monitoring mode"
 /usr/bin/nexutil -m2
 EOF
-chmod +x kali-$architecture/usr/bin/monstart
+chmod 755 kali-$architecture/usr/bin/monstart
 
 cat << EOF > kali-$architecture/usr/bin/monstop
 #!/bin/bash
 /usr/bin/nexutil -m0
 echo "Monitor mode stopped"
 EOF
-chmod +x kali-$architecture/usr/bin/monstop
+chmod 755 kali-$architecture/usr/bin/monstop
 
 cat << 'EOF' > kali-$architecture/lib/systemd/system/regenerate_ssh_host_keys.service
 [Unit]
@@ -156,14 +156,14 @@ mkdir -p kali-$architecture/usr/bin
 cp ${basedir}/../misc/pi-bluetooth/btuart kali-$architecture/usr/bin/btuart
 cp ${basedir}/../misc/pi-bluetooth/pi-bluetooth_0.1.4+re4son_all.deb kali-$architecture/tmp/pi-bluetooth_0.1.4+re4son_all.deb
 # Ensure btuart is executable
-chmod +x kali-$architecture/usr/bin/btuart
+chmod 755 kali-$architecture/usr/bin/btuart
 
 cat << EOF > kali-$architecture/third-stage
 #!/bin/bash
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -186,7 +186,7 @@ apt-get --yes --allow-change-held-packages autoremove
 
 # Install P4wnP1 (kali version)
 git clone https://github.com/nethunteros/P4wnP1.git /root/P4wnP1
-chmod +x /root/P4wnP1/install.sh
+chmod 755 /root/P4wnP1/install.sh
 cd /root/P4wnP1 
 git submodule init
 git submodule update --recursive --remote && 
@@ -240,7 +240,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M 0wp4np1 -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -254,7 +254,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M 0wp4np1 -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -380,12 +380,12 @@ cp ${basedir}/../misc/rpi3/brcmfmac43430-sdio.txt ${basedir}/root/lib/firmware/b
 
 # Copy nexutil
 cp ${basedir}/../misc/rpi3/nexutil-pi0 ${basedir}/root/usr/bin/nexutil
-chmod +x ${basedir}/root/usr/bin/nexutil
+chmod 755 ${basedir}/root/usr/bin/nexutil
 
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/rpi0w-nexmon.sh b/rpi0w-nexmon.sh
index 9a3ff72..17bfffe 100755
--- a/rpi0w-nexmon.sh
+++ b/rpi0w-nexmon.sh
@@ -106,14 +106,14 @@ cat << EOF > kali-$architecture/usr/bin/monstart
 echo "Nexutil setting monitoring mode"
 /usr/bin/nexutil -m2
 EOF
-chmod +x kali-$architecture/usr/bin/monstart
+chmod 755 kali-$architecture/usr/bin/monstart
 
 cat << EOF > kali-$architecture/usr/bin/monstop
 #!/bin/bash
 /usr/bin/nexutil -m0
 echo "Monitor mode stopped"
 EOF
-chmod +x kali-$architecture/usr/bin/monstop
+chmod 755 kali-$architecture/usr/bin/monstop
 
 cat << 'EOF' > kali-$architecture/lib/systemd/system/regenerate_ssh_host_keys.service
 [Unit]
@@ -152,14 +152,14 @@ cp ${basedir}/../misc/pi-bluetooth/hciuart.service kali-$architecture/lib/system
 mkdir -p kali-$architecture/usr/bin
 cp ${basedir}/../misc/pi-bluetooth/btuart kali-$architecture/usr/bin/btuart
 # Ensure btuart is executable
-chmod +x kali-$architecture/usr/bin/btuart
+chmod 755 kali-$architecture/usr/bin/btuart
 
 cat << EOF > kali-$architecture/third-stage
 #!/bin/bash
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -216,7 +216,7 @@ rm -f /0
 rm -f /hs_err*
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M 0w -D kali-$architecture /third-stage
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -336,12 +336,12 @@ cp ${basedir}/../misc/rpi3/brcmfmac43430-sdio.txt ${basedir}/root/lib/firmware/b
 
 # Copy nexutil
 cp ${basedir}/../misc/rpi3/nexutil-pi0 ${basedir}/root/usr/bin/nexutil
-chmod +x ${basedir}/root/usr/bin/nexutil
+chmod 755 ${basedir}/root/usr/bin/nexutil
 
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/rpi2.sh b/rpi2.sh
index 295eb92..fbf70ac 100755
--- a/rpi2.sh
+++ b/rpi2.sh
@@ -3,6 +3,11 @@
 # This is the Raspberry Pi2 Kali ARM build script - http://www.kali.org/downloads
 # A trusted Kali Linux image created by Offensive Security - http://www.offensive-security.com
 
+if [[ $EUID -ne 0 ]]; then
+   echo "This script must be run as root"
+   exit 1
+fi
+
 if [[ $# -eq 0 ]] ; then
     echo "Please pass version number, e.g. $0 2.0"
     exit 0
@@ -20,7 +25,7 @@ basedir=`pwd`/rpi2-$1
 # image, keep that in mind.
 
 arm="abootimg cgpt fake-hwclock ntpdate u-boot-tools vboot-utils vboot-kernel-utils"
-base="e2fsprogs initramfs-tools kali-defaults kali-menu parted sudo usbutils"
+base="e2fsprogs initramfs-tools kali-defaults kali-menu parted sudo usbutils firmware-linux firmware-atheros firmware-libertas firmware-realtek"
 # XFCE desktop (Default)
 desktop="fonts-croscore fonts-crosextra-caladea fonts-crosextra-carlito gnome-theme-kali gtk3-engines-xfce kali-desktop-xfce kali-root-login lightdm network-manager network-manager-gnome xfce4 xserver-xorg-video-fbdev xserver-xorg-input-evdev xserver-xorg-input-synaptics xfce4-terminal"
 # GNOME desktop
@@ -94,12 +99,41 @@ console-common console-data/keymap/policy select Select keymap from full list
 console-common console-data/keymap/full select en-latin1-nodeadkeys
 EOF
 
+cat << 'EOF' > kali-$architecture/lib/systemd/system/regenerate_ssh_host_keys.service
+[Unit]
+Description=Regenerate SSH host keys
+Before=ssh.service
+[Service]
+Type=oneshot
+ExecStartPre=-/bin/dd if=/dev/hwrng of=/dev/urandom count=1 bs=4096
+ExecStartPre=-/bin/sh -c "/bin/rm -f -v /etc/ssh/ssh_host_*_key*"
+ExecStart=/usr/bin/ssh-keygen -A -v
+ExecStartPost=/bin/sh -c "for i in /etc/ssh/ssh_host_*_key*; do actualsize=$(wc -c <\"$i\") ;if [ $actualsize -eq 0 ]; then echo size is 0 bytes ; exit 1 ; fi ; done ; /bin/systemctl disable regenerate_ssh_host_keys"
+[Install]
+WantedBy=multi-user.target
+EOF
+chmod 644 kali-$architecture/lib/systemd/system/regenerate_ssh_host_keys.service
+
+cat << EOF > kali-$architecture/lib/systemd/system/rpiwiggle.service
+[Unit]
+Description=Resize filesystem
+Before=regenerate_ssh_host_keys.service
+[Service]
+Type=oneshot
+ExecStart=/root/scripts/rpi-wiggle.sh
+ExecStartPost=/bin/systemctl disable rpiwiggle
+ExecStartPost=/sbin/reboot
+[Install]
+WantedBy=multi-user.target
+EOF
+chmod 644 kali-$architecture/lib/systemd/system/rpiwiggle.service
+
 cat << EOF > kali-$architecture/third-stage
 #!/bin/bash
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -110,7 +144,6 @@ apt-get update
 apt-get -y install git-core binutils ca-certificates initramfs-tools u-boot-tools
 apt-get -y install locales console-common less nano git
 echo "root:toor" | chpasswd
-sed -i -e 's/KERNEL\!=\"eth\*|/KERNEL\!=\"/' /lib/udev/rules.d/75-persistent-net-generator.rules
 rm -f /etc/udev/rules.d/70-persistent-net.rules
 export DEBIAN_FRONTEND=noninteractive
 apt-get --yes --allow-change-held-packages install $packages
@@ -126,7 +159,13 @@ apt-get --yes --allow-change-held-packages autoremove
 
 echo "Making the image insecure"
 sed -i -e 's/^#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-update-rc.d ssh enable
+
+# Resize FS on first run (hopefully)
+systemctl enable rpiwiggle
+
+# Generate SSH host keys on first run
+systemctl enable regenerate_ssh_host_keys
+systemctl enable ssh
 
 # libinput seems to fail hard on RaspberryPi devices, so we make sure it's not
 # installed here (and we have xserver-xorg-input-evdev and
@@ -140,7 +179,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M rpi2 -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -154,7 +193,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M rpi2 -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -202,15 +241,14 @@ EOF
 
 # Kernel section. If you want to use a custom kernel, or configuration, replace
 # them in this section.
-git clone --depth 1 https://github.com/raspberrypi/linux -b rpi-4.4.y ${basedir}/root/usr/src/kernel
+git clone --depth 1 https://github.com/nethunteros/re4son-raspberrypi-linux.git -b rpi-4.9.80-re4son ${basedir}/root/usr/src/kernel
 cd ${basedir}/root/usr/src/kernel
-git rev-parse HEAD > ../kernel-at-commit
-patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/kali-wifi-injection-4.4.patch
+git rev-parse HEAD > ${basedir}/usr/src/kernel-at-commit
+patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/kali-wifi-injection-4.9.patch
 touch .scmversion
 export ARCH=arm
 export CROSS_COMPILE=arm-linux-gnueabihf-
-cp ${basedir}/../kernel-configs/rpi2-4.4.config .config
-cp ${basedir}/../kernel-configs/rpi2-4.4.config ../rpi2-4.4.config
+make re4son_pi2_defconfig
 make -j $(grep -c processor /proc/cpuinfo)
 make modules_install INSTALL_MOD_PATH=${basedir}/root
 git clone --depth 1 https://github.com/raspberrypi/firmware.git rpi-firmware
@@ -221,14 +259,9 @@ perl scripts/mkknlimg --dtok arch/arm/boot/zImage ${basedir}/bootp/kernel7.img
 cp arch/arm/boot/dts/*.dtb ${basedir}/bootp/
 mkdir -p ${basedir}/bootp/overlays/
 cp arch/arm/boot/dts/overlays/*.dtb* ${basedir}/bootp/overlays/
-rm -rf ${basedir}/root/lib/firmware
-cd ${basedir}/root/lib
-git clone --depth 1 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git firmware
-rm -rf ${basedir}/root/lib/firmware/.git
-cd ${basedir}/root/usr/src/kernel
 make INSTALL_MOD_PATH=${basedir}/root firmware_install
 make mrproper
-cp ../rpi2-4.4.config .config
+make re4son_pi2_defconfig
 make modules_prepare
 cd ${basedir}
 
@@ -266,34 +299,34 @@ cp ${basedir}/../misc/rpi3/brcmfmac43430-sdio.bin ${basedir}/root/lib/firmware/b
 
 cd ${basedir}
 
+# rpi-wiggle
+mkdir -p ${basedir}/root/scripts
+wget https://raw.githubusercontent.com/offensive-security/rpiwiggle/master/rpi-wiggle -O kali-$architecture/root/rpi-wiggle.sh
+chmod 755 ${basedir}/kali-$architecture/root/rpi-wiggle.sh
+
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
 # Unmount partitions
-umount $bootp
-umount $rootp
+sync
+umount -l $bootp
+umount -l $rootp
 kpartx -dv $loopdevice
 losetup -d $loopdevice
 
+
+# Don't pixz on 32bit, there isn't enough memory to compress the images.
+MACHINE_TYPE=`uname -m`
+if [ ${MACHINE_TYPE} == 'x86_64' ]; then
+echo "Compressing kali-linux-$1-rpi2.img"
+pixz ${basedir}/kali-linux-$1-rpi2.img ${basedir}/../kali-linux-$1-rpi2.img.xz
+rm ${basedir}/kali-linux-$1-rpi2.img
+fi
+
 # 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.
 echo "Cleaning up the temporary build files..."
-rm -rf ${basedir}/kernel ${basedir}/bootp ${basedir}/root ${basedir}/kali-$architecture ${basedir}/boot ${basedir}/patches
-
-# If you're building an image for yourself, comment all of this out, as you
-# don't need the sha256sum or to compress the image, since you will be testing it
-# soon.
-echo "Generating sha256sum for kali-linux-$1-rpi2.img"
-sha256sum kali-linux-$1-rpi2.img > ${basedir}/kali-linux-$1-rpi2.img.sha256sum
-# Don't pixz on 32bit, there isn't enough memory to compress the images.
-MACHINE_TYPE=`uname -m`
-if [ ${MACHINE_TYPE} == 'x86_64' ]; then
-echo "Compressing kali-linux-$1-rpi2.img"
-pixz ${basedir}/kali-linux-$1-rpi2.img ${basedir}/kali-linux-$1-rpi2.img.xz
-rm ${basedir}/kali-linux-$1-rpi2.img
-echo "Generating sha256sum for kali-linux-$1-rpi2.img.xz"
-sha256sum kali-linux-$1-rpi2.img.xz > ${basedir}/kali-linux-$1-rpi2.img.xz.sha256sum
-fi
+rm -rf ${basedir}
diff --git a/rpi3-nexmon.sh b/rpi3-nexmon.sh
index a61c669..5ca3afe 100755
--- a/rpi3-nexmon.sh
+++ b/rpi3-nexmon.sh
@@ -152,7 +152,7 @@ if [ $? -eq 0 ]; then
   echo "started monitor interface on ${interface}"
 fi
 EOF
-chmod +x kali-$architecture/usr/bin/monstart
+chmod 755 kali-$architecture/usr/bin/monstart
 
 cat << 'EOF' > kali-$architecture/usr/bin/monstop
 #!/bin/bash
@@ -161,7 +161,7 @@ ifconfig ${interface} down
 sleep 1
 iw dev ${interface} del
 EOF
-chmod +x kali-$architecture/usr/bin/monstop
+chmod 755 kali-$architecture/usr/bin/monstop
 
 # Bluetooth enabling
 mkdir -p kali-$architecture/etc/udev/rules.d
@@ -171,14 +171,14 @@ cp ${basedir}/../misc/pi-bluetooth/hciuart.service kali-$architecture/lib/system
 mkdir -p kali-$architecture/usr/bin
 cp ${basedir}/../misc/pi-bluetooth/btuart kali-$architecture/usr/bin/btuart
 # Ensure btuart is executable
-chmod +x kali-$architecture/usr/bin/btuart
+chmod 755 kali-$architecture/usr/bin/btuart
 
 cat << EOF > kali-$architecture/third-stage
 #!/bin/bash
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
 debconf-set-selections /debconf.set
@@ -228,7 +228,7 @@ rm -f cleanup
 #rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 
 cat << 'EOF' > kali-$architecture/root/buildnexmon.sh
 #!/bin/bash
@@ -267,7 +267,7 @@ make
 cp /opt/nexmon/patches/bcm43455c0/7_45_154/nexmon/brcmfmac_4.9.y-nexmon/brcmfmac.ko /lib/modules/${kernel}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 cp /opt/nexmon/patches/bcm43455c0/7_45_154/nexmon/brcmfmac43455-sdio.bin /lib/firmware/brcm/
 EOF
-chmod +x kali-$architecture/root/buildnexmon.sh
+chmod 755 kali-$architecture/root/buildnexmon.sh
 
 # rpi-wiggle
 mkdir -p ${basedir}/root/scripts
@@ -413,13 +413,13 @@ cp ${basedir}/../misc/brcm/brcmfmac43455-sdio.txt ${basedir}/root/lib/firmware/b
 cp ${basedir}/../misc/brcm/brcmfmac43455-sdio.clm_blob ${basedir}/root/lib/firmware/brcm/
 
 cp ${basedir}/../misc/rpi3/nexutil ${basedir}/root/usr/bin/nexutil
-chmod +x ${basedir}/root/usr/bin/nexutil
+chmod 755 ${basedir}/root/usr/bin/nexutil
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 LANG=C systemd-nspawn -M rpi3 -D ${basedir}/root/ /bin/bash -c "cd /root && gcc -Wall -shared -o libfakeuname.so fakeuname.c"
-LANG=C systemd-nspawn -M rpi3 -D ${basedir}/root/ /bin/bash -c "chmod +x /root/buildnexmon.sh && LD_PRELOAD=/root/libfakeuname.so /root/buildnexmon.sh"
+LANG=C systemd-nspawn -M rpi3 -D ${basedir}/root/ /bin/bash -c "chmod 755 /root/buildnexmon.sh && LD_PRELOAD=/root/libfakeuname.so /root/buildnexmon.sh"
 
 rm -rf ${basedir}/root/root/{fakeuname.c,buildnexmon.sh,libfakeuname.so}
 
diff --git a/usbarmory.sh b/usbarmory.sh
index 544c9ae..048673a 100755
--- a/usbarmory.sh
+++ b/usbarmory.sh
@@ -107,7 +107,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -145,7 +145,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M usbarmory -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -161,7 +161,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M usbarmory -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -404,7 +404,7 @@ rm -rf .git
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin prohibit-password/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
 
diff --git a/utilite.sh b/utilite.sh
index fdf1db3..fea8791 100755
--- a/utilite.sh
+++ b/utilite.sh
@@ -108,7 +108,7 @@ cat << EOF > kali-$architecture/third-stage
 dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
 cp /bin/true /usr/sbin/invoke-rc.d
 echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
+chmod 755 /usr/sbin/policy-rc.d
 
 apt-get update
 apt-get --yes --allow-change-held-packages install locales-all
@@ -137,7 +137,7 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /third-stage
 EOF
 
-chmod +x kali-$architecture/third-stage
+chmod 755 kali-$architecture/third-stage
 LANG=C systemd-nspawn -M utilite -D kali-$architecture /third-stage
 
 cat << EOF > kali-$architecture/cleanup
@@ -151,7 +151,7 @@ rm -f cleanup
 rm -f /usr/bin/qemu*
 EOF
 
-chmod +x kali-$architecture/cleanup
+chmod 755 kali-$architecture/cleanup
 LANG=C systemd-nspawn -M utilite -D kali-$architecture /cleanup
 
 #umount kali-$architecture/proc/sys/fs/binfmt_misc
@@ -273,7 +273,7 @@ rm -rf ${basedir}/root/lib/firmware/.git
 cd ${basedir}
 
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
-chmod +x ${basedir}/root/etc/init.d/zram
+chmod 755 ${basedir}/root/etc/init.d/zram
 
 sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config