X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=534e1fac2b2d1f8e4c0437329f743eaf910cfcb5;hb=6315fdaa029f0f107d98fde18ab584f958e06108;hp=3d024af5dbcc789939423f3afa2fc14089677d86;hpb=ab68265ccb7857baff11c0cc216e0c5e9bf4d629;p=automated-distro-installer diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index 3d024af..534e1fa 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -25,12 +25,14 @@ if [[ $EUID != 0 ]]; then fi # for calling outside of FAI: -# # need to redep and set that location so that we get luks keys -# export FAI=/srv/fai/config # 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 +# or run eval-fai-classfile FILE. +# - Set a VOL_DISTROVER, eg: +# fai-setclass VOL_NABIA +# - export luks_dir=/q/root/luks # # OPTIONS: # @@ -74,7 +76,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 @@ -92,17 +94,28 @@ fi #### begin configuration +# this is the ordering of the /dev/sdaX, but +# the ordering of the partition layout goes like this: +# bios_grub +# grub_ext +# efi +# root +# swap +# boot + rootn=1 swapn=2 bootn=3 +efin=4 # 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=4 +grub_extn=5 # bios boot partition, # https://wiki.archlinux.org/index.php/GRUB -bios_grubn=5 +bios_grubn=6 +even_bign=7 lastn=$bios_grubn @@ -111,7 +124,7 @@ lastn=$bios_grubn add-part() { # add partition suffix to $dev - local d ret + local d part if [[ $# == 1 ]]; then d=$dev part=$1 @@ -119,19 +132,16 @@ add-part() { # add partition suffix to $dev d=$1 part=$2 fi - if [[ $d == /dev/disk/by-id/* ]]; then - ret=$d-part$part - else - ret=$d$part - fi - echo $ret + 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; } crypt-dev() { echo /dev/mapper/crypt_dev_${1##*/}; } crypt-name() { echo crypt_dev_${1##*/}; } @@ -140,6 +150,38 @@ swap-cryptdev() { crypt-dev $(swapdev $@); } root-cryptname() { crypt-name $(rootdev $@); } swap-cryptname() { crypt-name $(swapdev $@); } +dev-mib() { + local d=${1:-$dev} + echo $(( $(parted -m $d unit MiB print | \ + sed -nr "s#^/dev/[^:]+:([0-9]+).*#\1#p") - 1)) +} + +luks-setup() { + local luksdev="$1" + # when we move to newer than trisquel 9, we can remove + # --type luks1. We can also check on cryptsetup --help | less /compil + # to see about the other settings. Default in debian 9 is luks2. + # You can convert from luks2 to luks 1 by adding a temporary key: + # 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 "$lukspw" | \ + cryptsetup luksAddKey --key-file $luks_file \ + $luksdev || [[ $? == 141 ]] + # background: Keyfile and password are treated just + # like 2 ways to input a passphrase, so we don't actually need to have + # different contents of keyfile and passphrase, but it makes some + # security sense to a really big randomly generated passphrase + # as much as possible, so we have both. + # + # This would remove the keyfile. + # yes 'test' | cryptsetup luksRemoveKey /dev/... \ + # /key/file || [[ $? == 141 ]] + cryptsetup luksOpen $luksdev $(crypt-name $luksdev) --key-file $luks_file +} + ##### end function defs if ifclass REPARTITION; then @@ -153,7 +195,7 @@ else wipe=true fi -if ((`nproc` > 2)); then +if (($(nproc) > 2)); then mopts=,compress=zstd fi @@ -173,12 +215,12 @@ fi hdds=() ssds=() -cd /sys/block -for disk in [sv]d[a-z]; do +# this excludes usb. note: i may encounter some other type in the future. +for disk in $(lsblk -do name,tran -n | awk '$2 ~ "^(sata|nvme)$" { print $1 }'); do if [[ ${disk_excludes[$disk]} ]]; then continue fi - case $(cat $disk/queue/rotational) in + case $(cat /sys/block/$disk/queue/rotational) in 0) ssds+=(/dev/$disk) ;; 1) hdds+=(/dev/$disk) ;; *) echo "$0: error: unknown /sys/block/$disk/queue/rotational: \ @@ -201,11 +243,10 @@ fi for dev in ${short_devs[@]}; do if $partition; then break; fi y=$(readlink -f $dev) - arr=($y[0-9]) - [[ ${#arr[@]} == "$lastn" ]] || partition=true - for (( i=1; i <= lastn; i++ )); do - [[ -e ${dev}$i ]] || partition=true - done + arr=($y?*) + if (( ${#arr[@]} < lastn )); then + partition=true + fi # On one system, blkid is missing some partitions. # maybe we need a flag, like FUZZY_BLKID or something, so we # can check that at least some exist. @@ -231,7 +272,7 @@ if [[ ! ${devs[0]} ]]; then fi boot_space=0 -first=false +first=true boot_devs=() for dev in ${devs[@]}; do if ifclass frodo; then @@ -264,15 +305,21 @@ for dev in ${devs[@]}; do sed -nr "s#^/dev/[^:]+:([0-9]+).*#\1#p") - 1)) boot_devs+=($(bootdev)) fi - if [[ $boot_devs && $first ]]; then + if $first && [[ $boot_devs ]]; then + first_efi=$(efidev) first_grub_extdev=$(grub_extdev) first=false fi done +first_boot_dev=${boot_devs[0]} +even_raid=false if ifclass RAID0 || (( ${#boot_devs[@]} == 1 )); then raid_level=0 elif ifclass RAID1 || (( ${#boot_devs[@]} <= 3 )); then + if (( ${#boot_devs[@]} == 2 )); then + even_raid=true + fi raid_level=1 else raid_level=10 @@ -325,12 +372,13 @@ if [[ ! $DISTRO ]]; then DISTRO=trisquelflidas elif ifclass VOL_ETIONA; then DISTRO=trisqueletiona + elif ifclass VOL_NABIA; then + DISTRO=trisquelnabia else echo "PARTITIONER ERROR: no distro class/var set" >&2 exit 1 fi fi -first_boot_dev=${boot_devs[0]} bpart() { # btrfs a partition @@ -342,33 +390,33 @@ bpart() { # btrfs a partition } -if [[ ! -e /a/bin/fai/fai-wrapper ]]; then +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) +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 - lukspw=$(cat $luks_dir/iank) + 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 + first_root_crypt=$(root-cryptdev ${devs[0]}) @@ -390,7 +438,7 @@ if $partition; then # if we repartition to the same as an old partition, # we don't want any old fses hanging around. for (( i=1; i <= lastn; i++ )); do - x=$(add-part $dev $i) + x=$(add-part $i) [[ -e $x ]] || continue count_down=10 # wipefs has failed, manual run works, google suggests timing issue @@ -404,6 +452,26 @@ if $partition; then fi ### end wipefs + + # When we have 2 disks of at least 100g difference in size, + # make an extra partition on the end of the bigger one. + even_big_part=false + even_diff_min=100000 + if $even_raid; then + smalli=0 + bigi=1 + if (( $(dev-mib ${devs[0]}) >= $(dev-mib ${devs[1]}) )); then + smalli=1 + bigi=0 + fi + disk_mib=$(dev-mib ${devs[smalli]}) + even_big_dev=${devs[bigi]} + even_big_mib=$(dev-mib $even_big_dev) + if (( even_big_mib - disk_mib > even_diff_min )); then + even_big_part=true + fi + fi + for dev in ${devs[@]}; do if [[ $SPECIAL_DISK ]]; then dev=$(devbyid $SPECIAL_DISK) @@ -415,38 +483,58 @@ if $partition; then # # Note: parted print error output is expected. example: # Error: /dev/vda: unrecognised disk label - disk_mib=$(( $(parted -m $dev unit MiB print | \ - sed -nr "s#^/dev/[^:]+:([0-9]+).*#\1#p") - 1)) - root_end=$(( disk_mib - swap_mib - boot_mib / ${#boot_devs[@]} )) + 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)) parted -s $dev mklabel gpt # MiB because parted complains about alignment otherwise. pcmd="parted -a optimal -s -- $dev" - $pcmd mkpart primary ext3 12MiB ${root_end}MiB + # root partition, the main big one + $pcmd mkpart primary ext3 524MiB ${root_end}MiB # 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 # 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 name $swapn swap + # boot partition $pcmd mkpart primary "" ${swap_end}MiB ${disk_mib}MiB $pcmd name $bootn boot + # uefi partition. efi sucks, half a gig, rediculous. + $pcmd mkpart primary "fat32" 12MiB 524MiB + $pcmd name $efin efi + $pcmd set $efin esp on + # note, this is shown here: https://support.system76.com/articles/bootloader/ + # but not mentioned https://wiki.archlinux.org/index.php/EFI_system_partition + # probably not needed + $pcmd set $bootn 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. # And 8 is still very tiny. + # grub_ext partition $pcmd mkpart primary "ext2" 4MiB 12MiB $pcmd name $grub_extn grubext # gpt ubuntu cloud image uses ~4 mb for this partition. fai uses 1 MiB. # so, I use 3, whatever. # note: parted manual saying cheap flash media # should to start at 4. + # biols grub partition $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 + $pcmd mkpart primary ext3 ${disk_mib}MiB ${even_big_mib}MiB + $pcmd name $even_bign even_big + fi + # the mkfs failed before on a vm, which prompted me to add # sleep .1 # then it failed again on a physical machine @@ -456,12 +544,20 @@ if $partition; then # Then I added the mkfs.ext2, which claimed to succeed, # but then couldn't be found upon reboot. In that case we didn't # wait at all. So I've added a 3 second minimum wait. - sleep 3 secs=0 - while [[ ! -e $(rootdev) ]] && (( secs < 10 )); do + while [[ ! -e $(bios_grubdev) ]] && (( secs < 10 )); do sleep 1 secs=$((secs +1)) done + sleep 3 + + mkfs.fat -F32 $(efidev) + + if $even_big_part && [[ $dev == $even_big_dev ]]; then + luks-setup $(even_bigdev) + mkfs.btrfs -f $(crypt-dev $(even_bigdev)) + fi + # Holds just a single file, rarely written, so # use ext2, like was often used for the /boot partition. # This exists because grub can only persist data to a non-cow fs. @@ -471,30 +567,7 @@ if $partition; then # This is just a bit more robust, and it could work for booting # into ipxe which can't persist data, if we ever got that working. mkfs.ext2 $(grub_extdev) - # when we move to newer than trisquel 8, we can remove - # --type luks1. We can also check on cryptsetup --help | less /compil - # to see about the other settings. Default in debian 9 is luks2. - # You can convert from luks2 to luks 1 by adding a temporary key: - # 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 $(rootdev) $luks_file \ - --type luks1 -c aes-cbc-essiv:sha256 -s 256 || [[ $? == 141 ]] - yes "$lukspw" | \ - cryptsetup luksAddKey --key-file $luks_file \ - $(rootdev) || [[ $? == 141 ]] - # background: Keyfile and password are treated just - # like 2 ways to input a passphrase, so we don't actually need to have - # different contents of keyfile and passphrase, but it makes some - # security sense to a really big randomly generated passphrase - # as much as possible, so we have both. - # - # This would remove the keyfile. - # yes 'test' | cryptsetup luksRemoveKey /dev/... \ - # /key/file || [[ $? == 141 ]] - - cryptsetup luksOpen $(rootdev) $(root-cryptname) \ - --key-file $luks_file + luks-setup $(rootdev) if [[ $SPECIAL_DISK ]]; then exit 0 @@ -535,12 +608,15 @@ if $wipe && [[ $DISTRO != debianbuster_bootstrap ]]; then # btrfs subvolume set-default \ # $(btrfs subvolume list . | grep "root_$DISTRO$" | awk '{print $2}') . - # no cow on the root filesystem. it's setup is fully scripted, - # if it's messed up, we will just recreated it, - # and we can get better perf with this. - # I can't remember exactly why, but this is preferable to mounting with - # -o nodatacow, I think because subvolumes inherit that. - chattr -Rf +C root_$DISTRO + # For raid systems, cow allows for error correction, for non-raid systems, + # protects root fs from having the plug pulled. Reprovisioning a root + # subvol is not my favorite thing to do. + # # no cow on the root filesystem. it's setup is fully scripted, + # # if it's messed up, we will just recreated it, + # # and we can get better perf with this. + # # I can't remember exactly why, but this is preferable to mounting with + # # -o nodatacow, I think because subvolumes inherit that. + # chattr -Rf +C root_$DISTRO cd / umount /mnt fi @@ -579,6 +655,7 @@ umount /mnt if [[ $DISTRO == debianbuster_bootstrap ]]; then cat > /tmp/fai/fstab </tmp/fai/disk_var.sh < /tmp/fai/fstab <> /tmp/fai/fstab <>/tmp/fai/crypttab <> /tmp/fai/fstab <