Merge branch 'liw/shquote' into 'master'

Fix: quote expansion of $ROOT in case it has problematic characters

See merge request raspi-team/image-specs!3
This commit is contained in:
Gunnar Wolf 2020-05-24 21:55:02 +00:00
commit 0cf508221f
1 changed files with 1 additions and 1 deletions

View File

@ -104,7 +104,7 @@ steps:
install -m 644 -o root -g root rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system" 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/" 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/rpi-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* rm -f "${ROOT?}"/etc/ssh/ssh_host_*_key*
root-fs: / root-fs: /
# Copy the relevant device tree files to the boot partition # Copy the relevant device tree files to the boot partition