Change: use mount point names for all tags

/ and /boot specifically. I find these names to be clearer.
This commit is contained in:
Lars Wirzenius 2019-01-13 15:38:36 +02:00
parent 5e2dc9c569
commit fe68770d3e
1 changed files with 16 additions and 17 deletions

View File

@ -12,32 +12,31 @@ steps:
device: "{{ output }}" device: "{{ output }}"
start: 0% start: 0%
end: 20% end: 20%
part-tag: boot-part tag: /boot
- mkpart: primary - mkpart: primary
device: "{{ output }}" device: "{{ output }}"
start: 20% start: 20%
end: 100% end: 100%
part-tag: root-fs tag: /
- kpartx: "{{ output }}" - kpartx: "{{ output }}"
- mkfs: vfat - mkfs: vfat
partition: boot-part partition: /boot
label: RASPIFIRM label: RASPIFIRM
- mkfs: ext4 - mkfs: ext4
partition: root-fs partition: /
label: RASPIROOT label: RASPIROOT
- mount: root-fs - mount: /
- mount: boot-part - mount: /boot
mount-on: root-fs mount-on: /
dirname: '/boot/firmware' dirname: '/boot/firmware'
fs-tag: boot-fs
- unpack-rootfs: root-fs - unpack-rootfs: /
# We need to use Debian buster (currently testing) instead of Debian stretch # We need to use Debian buster (currently testing) instead of Debian stretch
# (currently stable) for: # (currently stable) for:
@ -54,7 +53,7 @@ steps:
# required by the WiFi driver. # required by the WiFi driver.
- qemu-debootstrap: buster - qemu-debootstrap: buster
mirror: http://deb.debian.org/debian mirror: http://deb.debian.org/debian
target: root-fs target: /
arch: arm64 arch: arm64
components: components:
- main - main
@ -64,7 +63,7 @@ steps:
# TODO(https://bugs.debian.org/877855): remove this workaround once # TODO(https://bugs.debian.org/877855): remove this workaround once
# debootstrap is fixed # debootstrap is fixed
- chroot: root-fs - chroot: /
shell: | shell: |
echo 'deb http://deb.debian.org/debian buster main contrib non-free' > /etc/apt/sources.list echo 'deb http://deb.debian.org/debian buster main contrib non-free' > /etc/apt/sources.list
apt-get update apt-get update
@ -81,10 +80,10 @@ steps:
- wpasupplicant - wpasupplicant
- raspi3-firmware - raspi3-firmware
- linux-image-arm64 - linux-image-arm64
fs-tag: root-fs tag: /
unless: rootfs_unpacked unless: rootfs_unpacked
- cache-rootfs: root-fs - cache-rootfs: /
unless: rootfs_unpacked unless: rootfs_unpacked
- shell: | - shell: |
@ -117,18 +116,18 @@ steps:
Please change the root password by running passwd Please change the root password by running passwd
EOT EOT
root-fs: root-fs root-fs: /
# Clean up archive cache (likely not useful) and lists (likely outdated) to # Clean up archive cache (likely not useful) and lists (likely outdated) to
# reduce image size by several hundred megabytes. # reduce image size by several hundred megabytes.
- chroot: root-fs - chroot: /
shell: | shell: |
apt-get clean apt-get clean
rm -rf /var/lib/apt/lists rm -rf /var/lib/apt/lists
# Modify the kernel commandline we take from the firmware to boot from # 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
- chroot: root-fs - chroot: /
shell: | shell: |
ls -aR /boot ls -aR /boot
sed -i 's/.dev.mmcblk0p2/LABEL=RASPIROOT/' /boot/firmware/cmdline.txt sed -i 's/.dev.mmcblk0p2/LABEL=RASPIROOT/' /boot/firmware/cmdline.txt
@ -137,4 +136,4 @@ steps:
# clears /etc/resolv.conf on its own. # clears /etc/resolv.conf on its own.
- shell: | - shell: |
rm "${ROOT?}/etc/resolv.conf" rm "${ROOT?}/etc/resolv.conf"
root-fs: root-fs root-fs: /