From 87f57b446f22b2d18f0f96dac5d4db1b8d423e9b Mon Sep 17 00:00:00 2001 From: Gunnar Wolf Date: Fri, 19 Jul 2019 09:50:16 -0300 Subject: [PATCH] Fix remaining references to rpi3 (instead of rpi) --- raspi1_b0rken.yaml | 6 +++--- raspi1_uboot_b0rken.yaml | 6 +++--- raspi2.yaml | 6 +++--- raspi3.yaml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/raspi1_b0rken.yaml b/raspi1_b0rken.yaml index c33982c..c93bfce 100644 --- a/raspi1_b0rken.yaml +++ b/raspi1_b0rken.yaml @@ -102,14 +102,14 @@ steps: install -m 644 -o root -g root rules.v4 "${ROOT?}/etc/iptables/rules.v4" install -m 644 -o root -g root rules.v6 "${ROOT?}/etc/iptables/rules.v6" - install -m 755 -o root -g root rpi-resizerootfs "${ROOT?}/usr/sbin/rpi3-resizerootfs" + install -m 755 -o root -g root rpi-resizerootfs "${ROOT?}/usr/sbin/rpi-resizerootfs" install -m 644 -o root -g root rpi-resizerootfs.service "${ROOT?}/etc/systemd/system" mkdir -p "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/" - ln -s /etc/systemd/system/rpi-resizerootfs.service "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/rpi3-resizerootfs.service" + ln -s /etc/systemd/system/rpi-resizerootfs.service "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/rpi-resizerootfs.service" install -m 644 -o root -g root rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system" mkdir -p "${ROOT?}/etc/systemd/system/multi-user.target.requires/" - ln -s /etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi3-generate-ssh-host-keys.service" + ln -s /etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi-generate-ssh-host-keys.service" rm -f ${ROOT?}/etc/ssh/ssh_host_*_key* wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-b.dtb -O "${ROOT?}/boot/firmware/bcm2708-rpi-b.dtb" diff --git a/raspi1_uboot_b0rken.yaml b/raspi1_uboot_b0rken.yaml index afaf488..bcfdd82 100644 --- a/raspi1_uboot_b0rken.yaml +++ b/raspi1_uboot_b0rken.yaml @@ -134,14 +134,14 @@ steps: install -m 644 -o root -g root rules.v4 "${ROOT?}/etc/iptables/rules.v4" install -m 644 -o root -g root rules.v6 "${ROOT?}/etc/iptables/rules.v6" - install -m 755 -o root -g root rpi-resizerootfs "${ROOT?}/usr/sbin/rpi3-resizerootfs" + install -m 755 -o root -g root rpi-resizerootfs "${ROOT?}/usr/sbin/rpi-resizerootfs" install -m 644 -o root -g root rpi-resizerootfs.service "${ROOT?}/etc/systemd/system" mkdir -p "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/" - ln -s /etc/systemd/system/rpi-resizerootfs.service "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/rpi3-resizerootfs.service" + ln -s /etc/systemd/system/rpi-resizerootfs.service "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/rpi-resizerootfs.service" install -m 644 -o root -g root rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system" mkdir -p "${ROOT?}/etc/systemd/system/multi-user.target.requires/" - ln -s /etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi3-generate-ssh-host-keys.service" + ln -s /etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi-generate-ssh-host-keys.service" rm -f ${ROOT?}/etc/ssh/ssh_host_*_key* wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-b.dtb -O "${ROOT?}/boot/firmware/bcm2708-rpi-b.dtb" diff --git a/raspi2.yaml b/raspi2.yaml index 0657871..c21acc2 100644 --- a/raspi2.yaml +++ b/raspi2.yaml @@ -100,14 +100,14 @@ steps: install -m 644 -o root -g root rules.v4 "${ROOT?}/etc/iptables/rules.v4" install -m 644 -o root -g root rules.v6 "${ROOT?}/etc/iptables/rules.v6" - install -m 755 -o root -g root rpi-resizerootfs "${ROOT?}/usr/sbin/rpi3-resizerootfs" + install -m 755 -o root -g root rpi-resizerootfs "${ROOT?}/usr/sbin/rpi-resizerootfs" install -m 644 -o root -g root rpi-resizerootfs.service "${ROOT?}/etc/systemd/system" mkdir -p "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/" - ln -s /etc/systemd/system/rpi-resizerootfs.service "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/rpi3-resizerootfs.service" + ln -s /etc/systemd/system/rpi-resizerootfs.service "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/rpi-resizerootfs.service" install -m 644 -o root -g root rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system" mkdir -p "${ROOT?}/etc/systemd/system/multi-user.target.requires/" - ln -s /etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi3-generate-ssh-host-keys.service" + ln -s /etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi-generate-ssh-host-keys.service" rm -f ${ROOT?}/etc/ssh/ssh_host_*_key* wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2709-rpi-2-b.dtb -O "${ROOT?}/boot/bcm2708-rpi-2-b.dtb" diff --git a/raspi3.yaml b/raspi3.yaml index 8b7f7b0..84f4045 100644 --- a/raspi3.yaml +++ b/raspi3.yaml @@ -102,14 +102,14 @@ steps: install -m 644 -o root -g root rules.v4 "${ROOT?}/etc/iptables/rules.v4" install -m 644 -o root -g root rules.v6 "${ROOT?}/etc/iptables/rules.v6" - install -m 755 -o root -g root rpi-resizerootfs "${ROOT?}/usr/sbin/rpi3-resizerootfs" + install -m 755 -o root -g root rpi-resizerootfs "${ROOT?}/usr/sbin/rpi-resizerootfs" install -m 644 -o root -g root rpi-resizerootfs.service "${ROOT?}/etc/systemd/system" mkdir -p "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/" - ln -s /etc/systemd/system/rpi-resizerootfs.service "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/rpi3-resizerootfs.service" + ln -s /etc/systemd/system/rpi-resizerootfs.service "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/rpi-resizerootfs.service" install -m 644 -o root -g root rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system" mkdir -p "${ROOT?}/etc/systemd/system/multi-user.target.requires/" - ln -s /etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi3-generate-ssh-host-keys.service" + ln -s /etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi-generate-ssh-host-keys.service" rm -f ${ROOT?}/etc/ssh/ssh_host_*_key* cat >> "${ROOT?}/etc/motd" <<'EOT'