Imported 2.777

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2022-09-13 23:38:16 +00:00
parent 109a66a6e5
commit 30e2959c90
3 changed files with 23 additions and 3 deletions

15
debian/changelog vendored
View File

@ -1,3 +1,18 @@
livecd-rootfs (2.777) kinetic; urgency=medium
* Rename FK_FORCE_CONTAINER into FK_FORCE as its role was extended to also
support chroot (LP: #1989194).
-- Alexandre Ghiti <alexandre.ghiti@canonical.com> Thu, 08 Sep 2022 16:25:36 +0200
livecd-rootfs (2.776) kinetic; urgency=medium
* Do not modify /etc/ssh/sshd_config for ubuntu-cpc project
builds. (LP: #1968873). The cloud-init bug (LP #1968873) got
fixed so using a config snippet now.
-- Thomas Bechtold <thomas.bechtold@canonical.com> Tue, 23 Aug 2022 10:45:06 +0200
livecd-rootfs (2.775) kinetic; urgency=medium livecd-rootfs (2.775) kinetic; urgency=medium
[ Rudra Saraswat ] [ Rudra Saraswat ]

View File

@ -231,7 +231,7 @@ install_grub() {
# This explains why we install flash-kernel here. # This explains why we install flash-kernel here.
chroot mountpoint mkdir -p /etc/flash-kernel/ chroot mountpoint mkdir -p /etc/flash-kernel/
chroot mountpoint bash -c "echo 'Allwinner D1 Nezha' > /etc/flash-kernel/machine" chroot mountpoint bash -c "echo 'Allwinner D1 Nezha' > /etc/flash-kernel/machine"
chroot mountpoint bash -c 'FK_FORCE_CONTAINER=yes apt-get install -qqy grub-efi-riscv64 flash-kernel' chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
efi_target=riscv64-efi efi_target=riscv64-efi
chroot mountpoint apt-get install -qqy nezha-boot0 chroot mountpoint apt-get install -qqy nezha-boot0
@ -265,7 +265,7 @@ install_grub() {
# This explains why we install flash-kernel here. # This explains why we install flash-kernel here.
chroot mountpoint mkdir -p /etc/flash-kernel/ chroot mountpoint mkdir -p /etc/flash-kernel/
chroot mountpoint bash -c "echo 'StarFive VisionFive V1' > /etc/flash-kernel/machine" chroot mountpoint bash -c "echo 'StarFive VisionFive V1' > /etc/flash-kernel/machine"
chroot mountpoint bash -c 'FK_FORCE_CONTAINER=yes apt-get install -qqy grub-efi-riscv64 flash-kernel' chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
efi_target=riscv64-efi efi_target=riscv64-efi
# factory u-boot requires a p3 partition with /boot/uEnv.txt file # factory u-boot requires a p3 partition with /boot/uEnv.txt file

View File

@ -1,3 +1,8 @@
#!/bin/bash #!/bin/bash
sed -i "s|#PasswordAuthentication yes|PasswordAuthentication no|g" /etc/ssh/sshd_config # NOTE: the file number needs to be **higher** than the one
# cloud-init writes (cloud-init uses 50-cloud-init.conf) so
# the cloud-init file takes precedence
cat << EOF >> "/etc/ssh/sshd_config.d/60-cloudimg-settings.conf"
PasswordAuthentication no
EOF