Raspberries/image-specs
2
0
Fork 0
mirror of https://salsa.debian.org/raspi-team/image-specs synced 2026-05-30 06:38:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pythonize

Browse Source 
Let's catch up with the recent changes (boot-consistency merge, mainly).

Conflicts:
	Makefile
	raspi_master.yaml
This commit is contained in:
Cyril Brulebois
2021-11-20 14:01:01 +01:00
parent 66f43b854f 2b2bb9d6d7
commit 7bcb42a2ba
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
raspi_master.yaml
View File

@@ -134,14 +134,17 @@ steps:
rm -rf /var/lib/apt/lists
# Modify the kernel commandline we take from the firmware to boot from
# the partition labeled raspiroot instead of forcing it to mmcblk0p2
# the partition labeled raspiroot instead of forcing it to mmcblk0p2.
# Also insert the serial console right before the root= parameter.
#
# These changes will be overwritten after the hardware is probed
# after dpkg reconfigures raspi-firmware (upon first boot).
# after dpkg reconfigures raspi-firmware (upon first boot), so make
# sure we don't lose label-based booting.
- chroot: /
shell: |
sed -i 's/^/console=__SERIAL_CONSOLE__ /' /boot/firmware/cmdline.txt
sed -i 's/.dev.mmcblk0p2/LABEL=RASPIROOT/' /boot/firmware/cmdline.txt
sed -i 's/root=/console=__SERIAL_CONSOLE__ root=/' /boot/firmware/cmdline.txt
sed -i 's#root=/dev/mmcblk0p2#root=LABEL=RASPIROOT#' /boot/firmware/cmdline.txt
sed -i 's/^#ROOTPART=.*/ROOTPART=LABEL=RASPIROOT/' /etc/default/raspi-firmware
__EXTRA_CHROOT_SHELL_CMDS__
@@ -160,6 +163,8 @@ steps:
# populated during installation.
#
# Note this will also trigger ConditionFirstBoot=yes for systemd.
# On Buster, /etc/machine-id should be an emtpy file, not an absent file
# On Bullseye, /etc/machine-id should not exist in an image
- chroot: /
shell: |
rm -f /etc/machine-id /var/lib/dbus/machine-id