Merge branch 'pythonize'

raspi_master.yaml

@@ -49,14 +49,11 @@ steps:
     unless: rootfs_unpacked
 
   - create-file: /etc/apt/sources.list
-    trailing-newline: '1'
-    contents: |
+    contents: |+
       deb http://deb.debian.org/debian __RELEASE__ main contrib non-free
       deb http://security.debian.org/debian-security __SECURITY_SUITE__ main contrib non-free
-      # Backports are _not_ enabled by default.
-      # Enable them by uncommenting the following line:
-      # deb http://deb.debian.org/debian __RELEASE__-backports main contrib non-free
-      __OTHER_APT_ENABLE__
+      __BACKPORTS__
+
     unless: rootfs_unpacked
 
   - copy-file: /etc/initramfs-tools/hooks/rpi-resizerootfs
@@ -82,9 +79,9 @@ steps:
     - parted
     - ssh
     - wpasupplicant
-    - __FIRMWARE_PKG__
     - __LINUX_IMAGE__
-    __EXTRA_PKGS__
+    - __RASPI_FIRMWARE__
+    - __WIRELESS_FIRMWARE__
     tag: /
     unless: rootfs_unpacked
 
@@ -121,7 +118,7 @@ steps:
       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*
 
-      __EXTRA_SHELL_CMDS__
+      __EXTRA_ROOT_SHELL_CMDS__
     root-fs: /
 
   # Copy the relevant device tree files to the boot partition
@@ -149,6 +146,8 @@ steps:
       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__
+
   # TODO(https://github.com/larswirzenius/vmdb2/issues/24): remove once vmdb
   # clears /etc/resolv.conf on its own.
   - shell: |
@@ -169,4 +168,4 @@ steps:
   - chroot: /
     shell: |
       rm -f /etc/machine-id /var/lib/dbus/machine-id
-      touch /etc/machine-id
+      __TOUCH_MACHINE_ID__