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

rpis: set -e in the third-stage script

Browse Source
This commit is contained in:
Steev Klimaszewski
2018-07-06 09:49:23 -05:00
parent e8e2aa2cc6
commit b244626e4d
6 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rpi-tft.sh
View File

@@ -143,6 +143,7 @@ chmod 644 kali-${architecture}/lib/systemd/system/rpiwiggle.service
cat << EOF > kali-${architecture}/third-stage
#!/bin/bash
set -e
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

1
rpi.sh
View File

@@ -149,6 +149,7 @@ chmod 644 kali-${architecture}/lib/systemd/system/rpiwiggle.service
cat << EOF > kali-${architecture}/third-stage
#!/bin/bash
set -e
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

1
rpi0w-nexmon-p4wnp1.sh
View File

@@ -175,6 +175,7 @@ cp ${basedir}/../misc/config.txt ${basedir}/kali-${architecture}/boot/config.txt
cat << EOF > kali-${architecture}/third-stage
#!/bin/bash
set -e
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

6
rpi0w-nexmon.sh
View File

@@ -164,7 +164,6 @@ cp ${basedir}/../misc/pi-bluetooth/pi-bluetooth_0.1.4+re4son_all.deb kali-${arch
# Ensure btuart is executable
chmod 755 kali-${architecture}/usr/bin/btuart
# Fake a uname response so that flash-kernel doesn't bomb out.
cat << 'EOF' > kali-${architecture}/root/fakeuname.c
#define _GNU_SOURCE
#include <unistd.h>
@@ -180,14 +179,15 @@ int uname(struct utsname *buf)
{
int ret;
ret = syscall(SYS_uname, buf);
strcpy(buf->release, "4.16.0-kali2-armmp");
strcpy(buf->machine, "armv7l");
strcpy(buf->release, "4.14.30-kali-v7+");
strcpy(buf->machine, "armv6j");
return ret;
}
EOF
cat << EOF > kali-${architecture}/third-stage
#!/bin/bash
set -e
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

1
rpi2.sh
View File

@@ -139,6 +139,7 @@ chmod 644 kali-${architecture}/lib/systemd/system/rpiwiggle.service
cat << EOF > kali-${architecture}/third-stage
#!/bin/bash
set -e
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

5
rpi3-nexmon-hyperpixel.sh
View File

@@ -215,6 +215,7 @@ cp ${basedir}/../misc/fakeioctl.c ${basedir}/kali-${architecture}/root/fakeioctl
cat << EOF > ${basedir}/kali-${architecture}/third-stage
#!/bin/bash
set -e
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
@@ -230,12 +231,12 @@ export DEBIAN_FRONTEND=noninteractive
apt-get --yes --allow-change-held-packages install ${packages}
if [[ $? > 0 ]];
then
apt-get --yes --fix-broken install || systemctl exit 1
apt-get --yes --fix-broken install || exit 1
fi
apt-get --yes --allow-change-held-packages install ${desktop} ${tools}
if [[ $? > 0 ]];
then
apt-get --yes --fix-broken install || systemctl exit 1
apt-get --yes --fix-broken install || exit 1
fi
apt-get --yes --allow-change-held-packages autoremove
# Because copying in authorized_keys is hard for people to do, let's make the