Merge branch 'fix-missing-sfdisk-in-initramfs' into 'master'

Fix missing sfdisk binary in initramfs

See merge request fablab/labsync!68

packer/debian-bullseye.yaml

@@ -40,12 +40,14 @@ provisioners:
   - echo "LABSYNC_COMMIT_REF_SLUG='{{user `ci_commit_ref_slug`}}'" >> /etc/environment
   - echo "LABSYNC_PROJECT_URL='{{user `ci_project_url`}}'" >> /etc/environment
   - sed -i 's#@@PROJECT_URL@@#{{user `ci_project_url`}}#' /etc/initramfs-tools/scripts/labsync
+  - chmod +x /etc/initramfs-tools/scripts/labsync
   type: shell
 - destination: /etc/initramfs-tools/scripts/local-premount/
   source: initramfs/labsync-prereqs
   type: file
 - inline:
   - set -x
+  - chmod +x /etc/initramfs-tools/scripts/local-premount/labsync-prereqs
   - apt-get update
   - apt-get -y dist-upgrade
   - rmdir /boot && ln -s /usr/local/boot /boot
@@ -54,7 +56,7 @@ provisioners:
   - echo overlay >> /etc/initramfs-tools/modules
   - echo 'RESUME=none' > /etc/initramfs-tools/conf.d/resume
   - mkdir /usr/local/boot
-  - apt-get -f -y install aria2 linux-image-amd64 lvm2 haveged
+  - apt-get -f -y install aria2 linux-image-amd64 lvm2 haveged fdisk
   - mkdir -p /tmp/images
   - cp $(find /boot/ -name 'initrd.img-*' | sort -V | tail -n 1) '/tmp/images/{{user `initramfs_file`}}'
   - cp $(find /boot/ -name 'vmlinuz-*' | sort -V | tail -n 1) '/tmp/images/{{user `linux_file`}}'

packer/initramfs/labsync

@@ -112,7 +112,7 @@ labsync_mount_root() {
 		labsync_info "Updating partitions"
 		size_disk=$(blockdev --getsz /dev/${labsync_disk})
 		size_part_1=$((labsync_partsize_boot * 1024 * 1024 / 512))
-		size_part_2=$(((size_disk - labsync_partsize_boot) * 1024 * 1024 / 512))
+		size_part_2=$((size_disk - size_part_1 - 2048))
 		start_part_2=$((size_part_1 + 2048))
 
 		dmsetup ls --tree