From a3d473983d9234aa35a0015cee54a33eb3192208 Mon Sep 17 00:00:00 2001 From: nemunaire Date: Tue, 9 Jul 2019 20:09:59 +0200 Subject: [PATCH] fickit: Include /boot partition into RAID1 array, see https://outflux.net/blog/archives/2018/04/19/uefi-booting-and-raid1/ --- fickit-prepare.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fickit-prepare.yml b/fickit-prepare.yml index 967bdfc2..f2b59108 100644 --- a/fickit-prepare.yml +++ b/fickit-prepare.yml @@ -25,11 +25,11 @@ onboot: - name: raid-setup image: nemunaire/mdadm:90509bdc0a6ee2bb36635ddc2573ae50130f0f04 - command: ["/sbin/mdadm", "--create", "/dev/md0", "--run", "--level=1", "--metadata=0", "--raid-devices=2", "/dev/sda3", "/dev/sdb3" ] + command: ["/bin/sh", "-c", "/sbin/mdadm --create /dev/md2 --run --level=1 --metadata=1.0 --raid-devices=2 /dev/sda1 /dev/sdb1; /sbin/mdadm --create /dev/md1 --run --level=1 --metadata=1.1 --raid-devices=2 /dev/sda2 /dev/sdb2; /sbin/mdadm --create /dev/md0 --run --level=1 --metadata=0 --raid-devices=2 /dev/sda3 /dev/sdb3;"] - name: format image: linuxkit/format:v0.6 - command: ["/bin/sh", "-c", "mkswap /dev/sda2; mkswap /dev/sdb2; mkfs.ext4 /dev/md0 && sync" ] + command: ["/bin/sh", "-c", "mkswap /dev/md1; mkfs.ext4 /dev/md0 && sync" ] binds: - /dev:/dev @@ -50,9 +50,9 @@ files: contents: | #!/bin/sh for p; do - mkfs.vfat ${p}1 + mkfs.vfat ${p} mkdir -p /boot - mount ${p}1 /boot/ + mount ${p} /boot/ mkdir -p /boot/EFI/boot /boot/imgs cd /usr/share/syslinux/efi64 cp ldlinux.e64 menu.c32 libcom32.c32 libutil.c32 vesamenu.c32 poweroff.c32 /boot/EFI/boot @@ -92,7 +92,7 @@ files: # BIOS part dd bs=440 conv=notrunc count=1 if=/usr/share/syslinux/mbr.bin of=${p} - syslinux --install ${p}1 + syslinux --install ${p} cp /usr/share/syslinux/libcom32.c32 /usr/share/syslinux/libutil.c32 /usr/share/syslinux/poweroff.c32 /usr/share/syslinux/vesamenu.c32 /boot/ # Write images