Hibbian
/
Raspi-image-spec
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Fix rpi-generate-ssh-host-keys.service to use the correct package name in buster

This commit is contained in:
Gunnar Wolf 2021-07-02 13:01:17 -05:00
parent 84b6ac3864
commit feb61f3361
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -29,6 +29,7 @@ raspi_base_buster.yaml: raspi_master.yaml
sed "s/__FIRMWARE_PKG__/raspi3-firmware/" | \
sed "s/__RELEASE__/buster/" |\
sed "s/__SECURITY_SUITE__/buster\/updates/" |\
sed "s/__FIX_FIRMWARE_PKG_NAME__/sed -i s\/raspi-firmware\/raspi3-firmware\/ \/etc\/systemd\/system\/rpi-reconfigure-raspi-firmware.service/" |\
grep -v '__EXTRA_SHELL_CMDS__' > $@
raspi_1_buster.yaml: raspi_base_buster.yaml
@ -79,6 +80,7 @@ raspi_base_bullseye.yaml: raspi_master.yaml
sed "s/__RELEASE__/bullseye/" |\
sed "s/__FIRMWARE_PKG__/raspi-firmware/" | \
grep -v "__OTHER_APT_ENABLE__" |\
grep -v "__FIX_FIRMWARE_PKG_NAME__" |\
sed "s/__SECURITY_SUITE__/bullseye-security/" > $@
raspi_1_bullseye.yaml: raspi_base_bullseye.yaml

1
raspi_master.yaml
View File

@ -115,6 +115,7 @@ steps:
install -m 644 -o root -g root rootfs/etc/systemd/system/rpi-reconfigure-raspi-firmware.service "${ROOT?}/etc/systemd/system/"
mkdir -p "${ROOT?}/etc/systemd/system/multi-user.target.requires/"
ln -s /etc/systemd/system/rpi-reconfigure-raspi-firmware.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi-reconfigure-raspi-firmware.service"
__FIX_FIRMWARE_PKG_NAME__
install -m 644 -o root -g root rootfs/etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/"
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"