most: Re-arrange service dependencies

2019-05-17 11:26:25 -05:00
parent 9992676fb3
commit 3e847a42b6
19 changed files with 34 additions and 35 deletions
--- a/bbb.sh
+++ b/bbb.sh
@@ -132,7 +132,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -149,7 +149,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/nanopi2.sh
+++ b/nanopi2.sh
@@ -146,7 +146,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -163,7 +163,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/nanopi3.sh
+++ b/nanopi3.sh
@@ -147,7 +147,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -164,7 +164,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/nanopineoplus2.sh
+++ b/nanopineoplus2.sh
@@ -135,7 +135,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -152,7 +152,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/odroid-c2-mainline.sh
+++ b/odroid-c2-mainline.sh
@@ -146,7 +146,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -163,7 +163,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/odroid-c2.sh
+++ b/odroid-c2.sh
@@ -145,7 +145,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -162,7 +162,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/rpi-hyperpixel.sh
+++ b/rpi-hyperpixel.sh
@@ -132,7 +132,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -149,7 +149,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/rpi-tft.sh
+++ b/rpi-tft.sh
@@ -138,7 +138,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -155,7 +155,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/rpi.sh
+++ b/rpi.sh
@@ -132,7 +132,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -149,7 +149,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/rpi0w-nexmon-p4wnp1-aloa.sh
+++ b/rpi0w-nexmon-p4wnp1-aloa.sh
@@ -204,7 +204,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/rpi0w-nexmon.sh
+++ b/rpi0w-nexmon.sh
@@ -158,9 +158,8 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
-Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
 ExecStart=/bin/sh -c "rm -rf /etc/ssl/certs/*.pem && dpkg -i /root/ca-certificates_20190110_all.deb"
 ExecStart=/bin/sh -c "dpkg-reconfigure shared-mime-info"
@@ -175,7 +174,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/rpi2.sh
+++ b/rpi2.sh
@@ -137,7 +137,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -154,7 +154,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/rpi3-64-lite.sh
+++ b/rpi3-64-lite.sh
@@ -131,7 +131,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > "${basedir}"/kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/rpi3-64.sh
+++ b/rpi3-64.sh
@@ -114,7 +114,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -131,7 +131,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > "${basedir}"/kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/rpi3-debian.sh
+++ b/rpi3-debian.sh
@@ -114,7 +114,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -131,7 +131,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/rpi3-nexmon-hyperpixel.sh
+++ b/rpi3-nexmon-hyperpixel.sh
@@ -121,7 +121,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -138,7 +138,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > "${basedir}"/kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/trimslice.sh
+++ b/trimslice.sh
@@ -163,7 +163,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/regenerate_ssh_host_keys.s
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 [Unit]
 Description=shared-mime-info update hack
-Before=rpiwiggle.service
+Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
@@ -180,7 +180,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh
--- a/usbarmory.sh
+++ b/usbarmory.sh
@@ -142,7 +142,7 @@ Before=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 Environment=DEBIAN_FRONTEND=noninteractive
-ExecStart=/bin/sh -c "rm -rf /etc/ssl/certs/*.pem && dpkg -i /root/ca-certificates_20190110_all.deb /root/fontconfig_2.13.1-2_armhf.deb /root/libgdk-pixbuf2.0-0_2.38.1+dfsg-1_armhf.deb"
+ExecStart=/bin/sh -c "rm -rf /etc/ssl/certs/*.pem && dpkg -i /root/ca-certificates_20190110_all.deb"
 ExecStart=/bin/sh -c "dpkg-reconfigure shared-mime-info"
 ExecStart=/bin/sh -c "rm -f /root/*.deb"
 ExecStartPost=/bin/systemctl disable smi-hack
--- a/utilite.sh
+++ b/utilite.sh
@@ -159,7 +159,7 @@ chmod 644 kali-${architecture}/usr/lib/systemd/system/smi-hack.service
 cat << EOF > "${basedir}"/kali-${architecture}/usr/lib/systemd/system/rpiwiggle.service
 [Unit]
 Description=Resize filesystem
-Before=regenerate_ssh_host_keys.service
+After=regenerate_ssh_host_keys.service
 [Service]
 Type=oneshot
 ExecStart=/root/scripts/rpi-wiggle.sh