X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=d702351a38178de41b5ed2e6395af241ab9035dc;hb=4d23584c79e6c519f24042b11bc2cb5cd04ea284;hp=534e1fac2b2d1f8e4c0437329f743eaf910cfcb5;hpb=6315fdaa029f0f107d98fde18ab584f958e06108;p=automated-distro-installer diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index 534e1fa..d702351 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -24,17 +24,38 @@ if [[ $EUID != 0 ]]; then exit 1 fi -# for calling outside of FAI: +# for calling outside of FAI without args: # 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: +# ARGS (only 1 is valid): +# +# mkroot2: for running outside of fai and setting up the root2/boot2 luks and btrfs and tab files +# +# mkroot2tab: for running outside of fai and setting up the root2/boot2 tab files, in case luks and btrfs +# happen to already be setup. +# +# mktab: for running outside of fai and generating a crypttab for +# the main root fs in /tmp/fai. Must run with env var, eg export DISTRO=trisquelnabia. +# +# Example use in a bootstrap distro: +# scp /a/bin/fai/fai/config/{distro-install-common/devbyid,hooks/partition.DEFAULT} root@HOST: +# sl HOST +# export DISTRO=trisquelnabia; ./partition.DEFAULT mktab +# ## cryptsetup wont take within a pipeline +# mapfile -t lines < <(awk '! /swap/ {print $2,$1}' /tmp/fai/crypttab ) +# for l in "${lines[@]}"; do cryptsetup luksOpen $l; done +# +# # or alternatively, to avoid typing it many times: +# read -r lukspw; for l in "${lines[@]}"; do yes "$lukspw" | cryptsetup luksOpen $l; done + +## potentially useful later: +# sed 's#/root/keyscript,#decrypt_keyctl,#;s/$/,noauto/' /tmp/fai/crypttab >/etc/crypttab # # environment variables: # @@ -54,6 +75,8 @@ fi # # NOWIPE: use existing subvolumes if they exist # +# REROOTFS: Don't reuse the root filesystem, even if we normally would +# # ROTATIONAL: forces to install onto hdds instead of sdds. normally sdds # are chosen if they exist. # @@ -63,6 +86,36 @@ fi # raid10. # RAID1: forces raid1 filesystem. +mkroot2tab=false +mkroot2=false +mktab=false +if [[ $1 ]]; then + ## duplicates fai-wrapper, for convenience of not needing it + if ! type -t ifclass &>/dev/null; then + ifclass() { + local var=${1/#/CLASS_} + [[ $HOSTNAME == $1 || ${!var} ]] + } + fi + + case $1 in + mkroot2) + mkroot2=true + ;; + mkroot2tab) + mkroot2tab=true + ;; + mktab) + mktab=true + ;; + *) + echo "$0: error: unsupported arg: $1" >&2 + exit 1 + ;; + esac +fi + + if [[ $SPECIAL_DISK ]]; then export CLASS_REPARTITION=true fi @@ -76,7 +129,7 @@ skiptask partition || ! type skiptask if ! type -p devbyid; then for d in $FAI/distro-install-common \ - /a/bin/fai/fai/config/distro-install-common $FAI $PWD; do + /a/bin/fai/fai/config/distro-install-common $FAI $PWD; do [[ -d $d ]] || continue if [[ -e $d/devbyid ]]; then devbyid=$d/devbyid @@ -104,24 +157,28 @@ 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 +# for an even raid (raid 1), when one disk is bigger, this partition goes on the big disk +even_bign=9 lastn=$bios_grubn ##### end configuration +##### begin function defs add-part() { # add partition suffix to $dev local d part @@ -135,20 +192,33 @@ add-part() { # add partition suffix to $dev echo $d-part$part } -bootdev() { add-part $@ $bootn; } rootdev() { add-part $@ $rootn; } -swapdev() { add-part $@ $swapn; } -efidev() { add-part $@ $efin; } -grub_extdev() { add-part $@ $grub_extn; } -bios_grubdev() { add-part $@ $bios_grubn; } -even_bigdev() { add-part $@ $even_bign; } +root2dev() { add-part $@ $root2n; } + +# note, the following block could all have $@ like below +# But it is not added since it is not used and shellcheck +# rightly says args never used should not exist. +##swapdev() { add-part $swapn; } + +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; } +even_bigdev() { add-part $even_bign; } crypt-dev() { echo /dev/mapper/crypt_dev_${1##*/}; } crypt-name() { echo crypt_dev_${1##*/}; } root-cryptdev() { crypt-dev $(rootdev $@); } -swap-cryptdev() { crypt-dev $(swapdev $@); } -root-cryptname() { crypt-name $(rootdev $@); } -swap-cryptname() { crypt-name $(swapdev $@); } +root2-cryptdev() { crypt-dev $(root2dev $@); } + +# I omit a possible parameter since it is unused: +##swap-cryptdev() { crypt-dev $(swapdev $@); } +swap-cryptdev() { crypt-dev $(swapdev); } +root-cryptname() { crypt-name $(rootdev); } +root2-cryptname() { crypt-name $(root2dev); } +swap-cryptname() { crypt-name $(swapdev); } dev-mib() { local d=${1:-$dev} @@ -165,8 +235,7 @@ luks-setup() { # cryptsetup luksAddKey --pbkdf pbkdf2 # then remove the new format keys with cryptsetup luksRemoveKey # then cryptsetup convert DEV --type luks1, then readd old keys and remove temp. - yes YES | cryptsetup luksFormat $luksdev $luks_file \ - --type luks1 -c aes-cbc-essiv:sha256 -s 256 || [[ $? == 141 ]] + yes YES | cryptsetup luksFormat $luksdev $luks_file || [[ $? == 141 ]] yes "$lukspw" | \ cryptsetup luksAddKey --key-file $luks_file \ $luksdev || [[ $? == 141 ]] @@ -184,15 +253,20 @@ luks-setup() { ##### end function defs + +##### begin variable setup +partition=false if ifclass REPARTITION; then partition=true # force a full wipe -else - partition=false # change to true to force a full wipe fi +wipe=true if ifclass NOWIPE; then wipe=false -else - wipe=true +fi + +rerootfs=false +if ifclass REROOTFS; then + rerootfs=true fi if (($(nproc) > 2)); then @@ -200,11 +274,12 @@ if (($(nproc) > 2)); then fi declare -A disk_excludes -if ! ifclass USE_MOUNTED; then +if ! $mkroot2 && ! $mkroot2tab && ! $mktab ! ifclass USE_MOUNTED; then ## ignore disks that are mounted, eg when running from fai-cd while read -r l; do eval "$l" if [[ ! $PKNAME ]]; then + # shellcheck disable=SC2153 # not a misspelling PKNAME="$KNAME" fi if [[ $MOUNTPOINT ]]; then @@ -221,8 +296,8 @@ for disk in $(lsblk -do name,tran -n | awk '$2 ~ "^(sata|nvme)$" { print $1 }'); continue fi case $(cat /sys/block/$disk/queue/rotational) in - 0) ssds+=(/dev/$disk) ;; - 1) hdds+=(/dev/$disk) ;; + 0) ssds+=("/dev/$disk") ;; + 1) hdds+=("/dev/$disk") ;; *) echo "$0: error: unknown /sys/block/$disk/queue/rotational: \ $(cat $disk/queue/rotational)"; exit 1 ;; esac @@ -233,9 +308,9 @@ done # very odd, but convenient for ignoring them here. # TODO: find a reliable way to ignore them. if ! ifclass ROTATIONAL && (( ${#ssds[@]} > 0 )); then - short_devs=( ${ssds[@]} ) + read -ra short_devs<<<"${ssds[@]}" else - short_devs=( ${hdds[@]} ) + read -ra short_devs<<<"${hdds[@]}" fi # check if the partitions exist have the right filesystems @@ -243,6 +318,7 @@ fi for dev in ${short_devs[@]}; do if $partition; then break; fi y=$(readlink -f $dev) + # shellcheck disable=SC2206 # globbing is intended arr=($y?*) if (( ${#arr[@]} < lastn )); then partition=true @@ -264,7 +340,7 @@ fi devs=() shopt -s extglob for short_dev in ${short_devs[@]}; do - devs+=($(devbyid $short_dev)) + devs+=("$(devbyid $short_dev)") done if [[ ! ${devs[0]} ]]; then echo "$0: error: failed to detect devs" >&2 @@ -274,6 +350,7 @@ fi 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, @@ -299,13 +376,17 @@ for dev in ${devs[@]}; do 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)) + boot_devs+=("$(bootdev)") + boot2_devs+=("$(boot2dev)") fi - if $first && [[ $boot_devs ]]; then + if $first && (( ${#boot_devs[@]} >= 1 )) ; then first_efi=$(efidev) first_grub_extdev=$(grub_extdev) first=false @@ -325,6 +406,8 @@ else raid_level=10 fi + + ### Begin calculate boot partition space # due to raid duplication case $raid_level in @@ -335,31 +418,50 @@ if (( boot_space > 60000 )); then # becuase I keep a minimal debian install on it for # recovery needs and for doing pxe-kexec. boot_mib=10000 + root2_mib=1000000 + boot2_mib=5000 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 - # + # room. note: rhel 8 recomments 1g for /boot. u20.04 with 3 kernels = + # 308 mb, so things have grown significantly + boot_mib=1000 + 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 +bpart() { # btrfs a partition + case $raid_level in + 0) mkfs.btrfs -f $@ ;; + 1) mkfs.btrfs -f -m raid1 -d raid1 $@ ;; + 10) mkfs.btrfs -f -m raid10 -d raid10 $@ ;; + esac +} if [[ ! $DISTRO ]]; then - if ifclass VOL_BUSTER_BOOTSTRAP; then - DISTRO=debianbuster_bootstrap + if ifclass VOL_BULLSEYE_BOOTSTRAP; then + DISTRO=debianbullseye_bootstrap elif ifclass VOL_STRETCH; then DISTRO=debianstretch elif ifclass VOL_BUSTER; then DISTRO=debianbuster elif ifclass VOL_BULLSEYE; then DISTRO=debianbullseye + elif ifclass VOL_BOOKWORM; then + DISTRO=debianbookworm elif ifclass VOL_TESTING; then DISTRO=debiantesting elif ifclass VOL_XENIAL; then @@ -374,47 +476,20 @@ if [[ ! $DISTRO ]]; then DISTRO=trisqueletiona elif ifclass VOL_NABIA; then DISTRO=trisquelnabia + elif $mkroot2 || $mkroot2tab; then + : else echo "PARTITIONER ERROR: no distro class/var set" >&2 exit 1 fi fi - -bpart() { # btrfs a partition - case $raid_level in - 0) mkfs.btrfs -f $@ ;; - 1) mkfs.btrfs -f -m raid1 -d raid1 $@ ;; - 10) mkfs.btrfs -f -m raid10 -d raid10 $@ ;; - esac -} - - -if [[ ! $luks_dir ]]; then - # see README for docs about how to create these - luks_dir=$FAI/distro-install-common/luks -fi - -luks_file=$luks_dir/host-$HOSTNAME -if [[ ! -e $luks_file ]]; then - hostkeys=($luks_dir/host-*) - # if there is only one key, we might be deploying somewhere - # where dhcp doesnt give us a proper hostname, so use that. - if [[ ${#hostkeys[@]} == 1 && -e ${hostkeys[0]} ]]; then - luks_file=${hostkeys[0]} - else - echo "$0: error: no key for hostname at $luks_file" >&2 - exit 1 - fi -fi - -# # note, corresponding changes in /b/ds/keyscript-{on,off} -if ifclass demohost; then - lukspw=x -elif [[ -e $luks_dir/$HOSTNAME ]]; then - lukspw=$(cat $luks_dir/$HOSTNAME) +if [[ $DISTRO == debianbullseye_bootstrap ]]; then + # this is just convenience for the libreboot_grub config + # so we can glob the other ones easier. + boot_vol=$DISTRO else - lukspw=$(cat $luks_dir/iank) + boot_vol=boot_$DISTRO fi @@ -424,14 +499,172 @@ first_root_crypt=$(root-cryptdev ${devs[0]}) swap_mib=$(( $(grep ^MemTotal: /proc/meminfo | \ awk '{print $2}') * 3/(${#devs[@]} * 2 ) / 1024 )) -mkdir -p /tmp/fai root_devs=() for dev in ${devs[@]}; do - root_devs+=($(rootdev)) + root_devs+=("$(rootdev)") done shopt -s nullglob -if $partition; then +##### end variable setup + + +mktab() { + mkdir -p /tmp/fai + dev=${boot_devs[0]} + fstabstd="x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s" + + if [[ $DISTRO == debianbullseye_bootstrap ]]; then + cat > /tmp/fai/fstab </tmp/fai/disk_var.sh < /tmp/fai/fstab <>/tmp/fai/crypttab <> /tmp/fai/fstab </tmp/fai/disk_var.sh <>/tmp/fai/crypttab <> /tmp/fai/fstab <&2 + exit 1 + fi + fi + + luks_file=$luks_dir/host-$HOSTNAME + if [[ ! -e $luks_file ]]; then + # shellcheck disable=SC2206 # globbing is intended + hostkeys=($luks_dir/host-*) + # if there is only one key, we might be deploying somewhere + # where dhcp doesnt give us a proper hostname, so use that. + if [[ ${#hostkeys[@]} == 1 && -e ${hostkeys[0]} ]]; then + luks_file=${hostkeys[0]} + else + echo "$0: error: no key for hostname at $luks_file" >&2 + exit 1 + fi + fi + + # # note, corresponding changes in /b/ds/keyscript-{on,off} + if ifclass demohost; then + lukspw=x + elif [[ -e $luks_dir/$HOSTNAME ]]; then + lukspw=$(cat $luks_dir/$HOSTNAME) + else + lukspw=$(cat $luks_dir/iank) + fi + + if $mkroot2; then + luks_file=$luks_dir/host-amy + lukspw=$(cat $luks_dir/amy) + fi +} + + +#### root2 non-fai run +doroot2() { + + # We write to these files instead of just /etc/fstab, /etc/crypttab, + # because these are filesystems created after our current root, and so + # this allows us to update other root filesystems too. + rm -f /mnt/root/root2-{fs,crypt}tab + if $partition; then + echo $0: error: found partition=true but have mkroot2 arg + exit 1 + fi + for dev in ${devs[@]}; do + if $mkroot2; then + luks-setup $(root2dev) + fi + cat >>/mnt/root/root2-crypttab <>/mnt/root/root2-fstab < /tmp/fai/fstab </tmp/fai/disk_var.sh < /tmp/fai/fstab <>/tmp/fai/crypttab <> /tmp/fai/fstab </tmp/fai/disk_var.sh <>/tmp/fai/crypttab <> /tmp/fai/fstab <