# for calling outside of FAI:
# fai-redep
-# s
+#
# source /b/fai/fai-wrapper
# - set any appropriate classes with: fai-setclass OPT1... which sets CLASS_OPT1=true...
# or run eval-fai-classfile FILE.
-# - Set a VOL_DISTROVER, eg:
+# - Set a VOL_DISTROVER (if not doing mkroot2) eg:
# fai-setclass VOL_NABIA
-# - export luks_dir=/q/root/luks
#
# OPTIONS:
#
+# mkroot2: for running outside of fai and setting up the root2/boot2 luks and btrfs
+#
# environment variables:
#
# HOSTNAME: if frodo, we exclude 2 devices from the /boot array, which
# raid10.
# RAID1: forces raid1 filesystem.
+mkroot2=false
+case $1 in
+ mkroot2)
+ mkroot2=true
+ ;;
+ *)
+ echo "$0: error: unsupported arg: $1" >&2
+ exit 1
+ ;;
+esac
+
+
+
if [[ $SPECIAL_DISK ]]; then
export CLASS_REPARTITION=true
fi
# boot
rootn=1
-swapn=2
-bootn=3
-efin=4
+root2n=2
+swapn=3
+bootn=4
+boot2n=5
+efin=6
# ext partition so grub can write persistent variables,
# so it can do a one time boot. grub can't write to
# btrfs or any cow fs because it's more
# more complicated to do and they don't want to.
-grub_extn=5
+grub_extn=7
# bios boot partition,
# https://wiki.archlinux.org/index.php/GRUB
-bios_grubn=6
-even_bign=7
+bios_grubn=8
+even_bign=9
lastn=$bios_grubn
echo $d-part$part
}
-bootdev() { add-part $@ $bootn; }
rootdev() { add-part $@ $rootn; }
+root2dev() { add-part $@ $root2n; }
swapdev() { add-part $@ $swapn; }
+bootdev() { add-part $@ $bootn; }
+boot2dev() { add-part $@ $boot2n; }
efidev() { add-part $@ $efin; }
grub_extdev() { add-part $@ $grub_extn; }
bios_grubdev() { add-part $@ $bios_grubn; }
crypt-dev() { echo /dev/mapper/crypt_dev_${1##*/}; }
crypt-name() { echo crypt_dev_${1##*/}; }
root-cryptdev() { crypt-dev $(rootdev $@); }
+root2-cryptdev() { crypt-dev $(root2dev $@); }
swap-cryptdev() { crypt-dev $(swapdev $@); }
root-cryptname() { crypt-name $(rootdev $@); }
+root2-cryptname() { crypt-name $(root2dev $@); }
swap-cryptname() { crypt-name $(swapdev $@); }
dev-mib() {
fi
declare -A disk_excludes
-if ! ifclass USE_MOUNTED; then
+if ! $mkroot2 && ! ifclass USE_MOUNTED; then
## ignore disks that are mounted, eg when running from fai-cd
while read -r l; do
eval "$l"
boot_space=0
first=true
boot_devs=()
+boot2_devs=()
for dev in ${devs[@]}; do
if ifclass frodo; then
# I ran into a machine where the bios doesn't know about some disks,
break
fi
done
- $bad_disk || boot_devs+=($(bootdev))
+ if ! $bad_disk; then
+ boot_devs+=($(bootdev))
+ boot2_devs+=($(boot2dev))
+ fi
else
boot_space=$(( boot_space + $(parted -m $dev unit MiB print | \
sed -nr "s#^/dev/[^:]+:([0-9]+).*#\1#p") - 1))
boot_devs+=($(bootdev))
+ boot2_devs+=($(boot2dev))
fi
if $first && [[ $boot_devs ]]; then
first_efi=$(efidev)
# becuase I keep a minimal debian install on it for
# recovery needs and for doing pxe-kexec.
boot_mib=10000
+ root2_mib=200000
+ boot2_mib=500
elif (( boot_space > 30000 )); then
boot_mib=$(( 5000 + (boot_space - 30000) / 2 ))
+ root2_mib=100
+ boot2_mib=100
else
# Small vms don't have room for /boot recovery. With 3 kernels
# installed, i'm using 132M on t8, so this seems like plenty of
# room. note: rhel 8 recomments 1g for /boot.
boot_mib=500
- #
+ root2_mib=100
+ boot2_mib=100
fi
case $raid_level in
- 1*) boot_mib=$(( boot_mib * 2 )) ;;
+ 1*)
+ boot_mib=$(( boot_mib * 2 ))
+ boot2_mib=$(( boot2_mib * 2 ))
+ root2_mib=$(( root2_mib * 2 ))
+ ;;
esac
### end calculate boot partition space
DISTRO=trisqueletiona
elif ifclass VOL_NABIA; then
DISTRO=trisquelnabia
+ elif $mkroot2; then
+ :
else
echo "PARTITIONER ERROR: no distro class/var set" >&2
exit 1
if [[ ! $luks_dir ]]; then
# see README for docs about how to create these
luks_dir=$FAI/distro-install-common/luks
+ if [[ ! -d $luks_dir ]]; then
+ luks_dir=/q/root/luks
+ fi
+ if [[ ! -d $luks_dir ]]; then
+ echo "$0: error: no luks_dir found" >&2
+ exit 1
+ fi
fi
luks_file=$luks_dir/host-$HOSTNAME
root_devs+=($(rootdev))
done
shopt -s nullglob
-if $partition; then
+rm -f /mnt/root/root2-{fs,crypt}tab
+if $mkroot2; then
+ if $partition; then
+ echo $0: error: found partition=true but have mkroot2 arg
+ exit 1
+ fi
+ for dev in ${devs[@]}; do
+ luks_file=$luks_dir/host-amy
+ lukspw=$(cat $luks_dir/amy)
+ luks-setup $(root2dev)
+ cat >>/mnt/root/root2-crypttab <<EOF
+$(root2-cryptname) $(root2dev) $luks_file discard,luks,initramfs
+EOF
+ done
+ bpart $(for dev in ${devs[@]}; do root2-cryptdev; done)
+ bpart ${boot2_devs[@]}
+ mkdir -p /mnt/root2 /mnt/boot2
+ cat >>/mnt/root/root2-fstab <<EOF
+$(root2-cryptdev ${devs[0]}) /mnt/root2 btrfs nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,subvolid=0$mopts 0 0
+${boot2_devs[0]} /mnt/boot2 btrfs nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,subvolid=0 0 0
+EOF
+ exit 0
+fi
+
+
+if $partition; then
### begin wipefs
if [[ ! $SPECIAL_DISK ]]; then
for dev in ${devs[@]}; do
if ! $even_raid; then
disk_mib=$(dev-mib)
fi
- efi_mib=512
- root_end=$(( disk_mib - swap_mib - boot_mib / ${#boot_devs[@]} - efi_mib ))
- swap_end=$(( root_end + swap_mib))
+
+ boot_part_mib=$(( boot_mib / ${#boot_devs[@]} ))
+ boot2_part_mib=$(( boot2_mib / ${#boot_devs[@]} ))
+ root2_part_mib=$(( root2_mib / ${#root_devs[@]} ))
+ root_end=$(( disk_mib - root2_part_mib - swap_mib - boot_part_mib - boot2_part_mib ))
+ root2_end=$(( root_end + root2_part_mib ))
+ swap_end=$(( root2_end + swap_mib ))
+ boot_end=$(( swap_end + boot_part_mib ))
parted -s $dev mklabel gpt
# MiB because parted complains about alignment otherwise.
# without naming, systemd gives us misc errors like:
# dev-disk-by\x2dpartlabel-primary.device: Dev dev-disk-by\x2dpartlabel-primary.device appeared twice
$pcmd name $rootn root
+ # root2 partition
+ $pcmd mkpart primary ext3 ${root_end}MiB ${root2_end}MiB
+ $pcmd name $root2n root2
# normally a swap is type "linux-swap", but this is encrypted swap. using that
# label will confuse systemd.
# swap partition
- $pcmd mkpart primary "" ${root_end}MiB ${swap_end}MiB
+ $pcmd mkpart primary "" ${root2_end}MiB ${swap_end}MiB
$pcmd name $swapn swap
# boot partition
- $pcmd mkpart primary "" ${swap_end}MiB ${disk_mib}MiB
+ $pcmd mkpart primary "" ${swap_end}MiB ${boot_end}MiB
$pcmd name $bootn boot
+ # boot2 partition
+ $pcmd mkpart primary "" ${boot_end}MiB ${disk_mib}MiB
+ $pcmd name $boot2n boot2
# uefi partition. efi sucks, half a gig, rediculous.
$pcmd mkpart primary "fat32" 12MiB 524MiB
$pcmd name $efin efi
# but not mentioned https://wiki.archlinux.org/index.php/EFI_system_partition
# probably not needed
$pcmd set $bootn boot on
+ $pcmd set $boot2n boot on
# i only need a few k, but googling min size,
# I found someone saying that gparted required
# required at least 8 because of their hard drive cylinder size.
$pcmd mkpart primary "" 1MiB 4MiB
$pcmd name $bios_grubn biosgrub
$pcmd set $bios_grubn bios_grub on
- $pcmd set $bootn boot on # generally not needed on modern systems
- if $even_big_part && [[ $dev == $even_big_dev ]]; then
+ if $even_big_part && [[ $dev == "$even_big_dev" ]]; then
$pcmd mkpart primary ext3 ${disk_mib}MiB ${even_big_mib}MiB
$pcmd name $even_bign even_big
fi
mkfs.fat -F32 $(efidev)
- if $even_big_part && [[ $dev == $even_big_dev ]]; then
+ if $even_big_part && [[ $dev == "$even_big_dev" ]]; then
luks-setup $(even_bigdev)
mkfs.btrfs -f $(crypt-dev $(even_bigdev))
fi
grub-editenv /mnt/grubenv set last_boot=/$boot_vol
umount /mnt
+fstabstd=x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s
if [[ $DISTRO == debianbuster_bootstrap ]]; then
cat > /tmp/fai/fstab <<EOF
$first_boot_dev / btrfs noatime,subvol=$boot_vol 0 0
-$first_efi /boot/efi vfat nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s 0 0
+$first_efi /boot/efi vfat nofail,$fstabstd 0 0
EOF
cat >/tmp/fai/disk_var.sh <<EOF
BOOT_DEVICE="${short_devs[@]}"
else
# note, fai creates the mountpoints listed here
cat > /tmp/fai/fstab <<EOF
-$first_root_crypt / btrfs x-systemd.device-timeout=90s,x-systemd.mount-timeout=90s,noatime,subvol=root_$DISTRO$mopts 0 0
-$first_root_crypt /mnt/root btrfs nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,subvolid=0$mopts 0 0
-$first_boot_dev /boot btrfs nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,subvol=$boot_vol 0 0
-$first_efi /boot/efi vfat nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s 0 0
-$first_boot_dev /mnt/boot btrfs nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,subvolid=0 0 0
+$first_root_crypt / btrfs $fstabstdopts,noatime,subvol=root_$DISTRO$mopts 0 0
+$first_root_crypt /mnt/root btrfs nofail,$fstabstd,noatime,subvolid=0$mopts 0 0
+$first_boot_dev /boot btrfs nofail,$fstabstd,noatime,subvol=$boot_vol 0 0
+$first_efi /boot/efi vfat nofail,$fstabstd 0 0
+$first_boot_dev /mnt/boot btrfs nofail,$fstabstd,noatime,subvolid=0 0 0
EOF
swaps=()
rm -f /tmp/fai/crypttab
$(swap-cryptname) $(swapdev) /dev/urandom swap,cipher=aes-xts-plain64,size=256,hash=ripemd160
EOF
cat >> /tmp/fai/fstab <<EOF
-$(swap-cryptdev) none swap nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,sw 0 0
+$(swap-cryptdev) none swap nofail,$fstabstd,sw 0 0
EOF
done
SWAPLIST=\${SWAPLIST:-"${swaps[@]}"}
EOF
-
if [[ $HOSTNAME == kd ]]; then
# note, having these with keyscript and initramfs causes a luks error in fai.log,
# but it is safely ignorable and gets us the ability to just type our password
# in once at boot. A downside is that they are probably needed to be plugged in to boot.
cat >>/tmp/fai/crypttab <<EOF
-crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V-part7 /dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V-part7 none keyscript=decrypt_keyctl,discard,luks,initramfs
+crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V-part${even_bign} /dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V-part7 none keyscript=decrypt_keyctl,discard,luks,initramfs
crypt_dev_ata-TOSHIBA_MD04ACA500_84R2K773FS9A-part1 /dev/disk/by-id/ata-TOSHIBA_MD04ACA500_84R2K773FS9A-part1 none keyscript=decrypt_keyctl,discard,luks,initramfs
crypt_dev_ata-ST6000DM001-1XY17Z_Z4D29EBL-part1 /dev/disk/by-id/ata-ST6000DM001-1XY17Z_Z4D29EBL-part1 none keyscript=decrypt_keyctl,discard,luks,initramfs
EOF
cat >> /tmp/fai/fstab <<EOF
-# r7 = root partition7
-/dev/mapper/crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V-part7 /mnt/r7 btrfs nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,compress=zstd,subvolid=0 0 0
-/dev/mapper/crypt_dev_ata-TOSHIBA_MD04ACA500_84R2K773FS9A-part1 /mnt/rust1 btrfs nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,compress=zstd,subvolid=0 0 0
-/dev/mapper/crypt_dev_ata-ST6000DM001-1XY17Z_Z4D29EBL-part1 /mnt/rust2 btrfs nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,compress=zstd,subvolid=0 0 0
+# r7 = root partition7. it isnt actually #7 anymore, not a great name, but whatever
+/dev/mapper/crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V-part${even_bign} /mnt/r7 btrfs nofail,$fstabstd,noatime,compress=zstd,subvolid=0 0 0
+/dev/mapper/crypt_dev_ata-TOSHIBA_MD04ACA500_84R2K773FS9A-part1 /mnt/rust1 btrfs nofail,$fstabstd,noatime,compress=zstd,subvolid=0 0 0
+/dev/mapper/crypt_dev_ata-ST6000DM001-1XY17Z_Z4D29EBL-part1 /mnt/rust2 btrfs nofail,$fstabstd,noatime,compress=zstd,subvolid=0 0 0
EOF
fi
iankelling.org / git / automated-distro-installer / commitdiff