X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=ddcf53d16c631a8d39a435fb8582f2a798bee5dc;hb=9ac5bbeccb3e969e29b372656bd51352ff31b0b8;hp=9905602cab65a4108057e488a06a507a1ca954b5;hpb=d6df8985152a6c17523cedc3fee62694544eeaf2;p=automated-distro-installer diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index 9905602..ddcf53d 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -18,12 +18,49 @@ set -eE -o pipefail trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR +# for calling outside of FAI, first +# source /a/bin/fai-wrapper +# then to set classes with: fai-setclass OPT1... +# which sets CLASS_OPT1=true... +# +# OPTIONS: +# +# environment variables: +# +# HOSTNAME: if frodo, we exclude 2 devices from the /boot array, which +# the bios does not see. if demohost, we set the luks password to just +# 'x'. +# +# SPECIAL_DISK: For use outside of fai. A base disk name like +# /dev/sdk. If set, we just cryptsetup and partition this one disk then +# exit. This is useful for partitioning a disk in preparation to replace +# a failed or failing disk from a raid10 array. +# +# classes: +# +# REPARTITION: forces repartitioning even if we detect the proper amount +# of partitions already exist. +# +# ROTATIONAL: forces to install onto hdds instead of sdds. normally sdds +# are chosen if they exist. +# +# PARTITION_PROMPT: command line prompt before partitioning +# +# RAID0: forces raid0 filesystem. Normally with 4+ devices, we use +# raid10. + +if [[ $SPECIAL_DISK ]]; then + export CLASS_REPARTITION=true +fi + # # fai's setup-storage won't do btrfs on luks, # # so we do it ourself :) # inspiration taken from files in fai-setup-storage package +# if we are not running in fai, skiptask won't be defined, so carry on. +skiptask partition || ! type skiptask + -skiptask partition || ! type skiptask # for running not in fai #### begin configuration @@ -31,13 +68,18 @@ rootn=1 swapn=2 bootn=3 # ext partition so grub can write persistent variables, -# so it can do a one time boot. +# 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 # bios boot partition, # https://wiki.archlinux.org/index.php/GRUB bios_grubn=5 lastn=$bios_grubn -boot_mib=4000 +# this is larger than needed for several /boot subvols, +# becuase I keep a minimal debian install on it, for +# recovery needs, and for doing pxe-kexec. +boot_mib=10000 ##### end configuration @@ -64,9 +106,7 @@ bootdev() { add-part $@ $bootn; } rootdev() { add-part $@ $rootn; } swapdev() { add-part $@ $swapn; } grub_extdev() { add-part $@ $grub_extn; } -# Commented because it's not used, but left because it -# finishes the pattern and if we ever do need to use it, it's here. -#bios_grubdev() { add-part $@ $bios_grubn; } +bios_grubdev() { add-part $@ $bios_grubn; } crypt-dev() { echo /dev/mapper/crypt_dev_${1##*/}; } crypt-name() { echo crypt_dev_${1##*/}; } @@ -74,7 +114,14 @@ root-cryptdev() { crypt-dev $(rootdev $@); } swap-cryptdev() { crypt-dev $(swapdev $@); } root-cryptname() { crypt-name $(rootdev $@); } swap-cryptname() { crypt-name $(swapdev $@); } +devbyid() { + local f + for f in $FAI/distro-install-common/devbyid \ + /a/bin/fai/fai/config/distro-install-common/devbyid; do + if [[ -e $f ]]; then $f "$@"; break; fi + done +} ##### end function defs @@ -99,7 +146,7 @@ $(cat $disk/queue/rotational)"; exit 1 ;; done # install all ssds, or if there are none, all hdds -if (( ${#ssds[@]} > 0 )); then +if ! ifclass ROTATIONAL && (( ${#ssds[@]} > 0 )); then short_devs=( ${ssds[@]} ) else short_devs=( ${hdds[@]} ) @@ -110,8 +157,8 @@ fi for dev in ${short_devs[@]}; do if $partition; then break; fi y=$(readlink -f $dev) - x=($y[0-9]) - [[ ${#x[@]} == "${lastn}" ]] || partition=true + arr=($y[0-9]) + [[ ${#arr[@]} == "${lastn}" ]] || partition=true for (( i=1; i <= lastn; i++ )); do [[ -e ${dev}$i ]] || partition=true done @@ -173,17 +220,30 @@ for dev in ${devs[@]}; do fi done +if ifclass RAID0 || (( ${#boot_devs[@]} < 4 )); then + raid_level=0 +else + raid_level=10 + # need double the space if we are raid 10, and then + # might as well give some extra. + boot_mib=$((boot_mib * 3)) +fi + + + if [[ ! $DISTRO ]]; then - if ifclass STABLE_BOOTSTRAP; then - DISTRO=debianstable_bootstrap - elif ifclass STRETCH64; then + if ifclass VOL_STRETCH_BOOTSTRAP; then + DISTRO=debianstretch_bootstrap + elif ifclass VOL_STRETCH; then + DISTRO=debianstretch + elif ifclass VOL_TESTING; then DISTRO=debiantesting - elif ifclass STABLE; then - DISTRO=debianstable - elif ifclass XENIAL64; then + elif ifclass VOL_XENIAL; then DISTRO=ubuntuxenial - elif ifclass BELENOS64; then + elif ifclass VOL_BELENOS; then DISTRO=trisquelbelenos + elif ifclass VOL_FLIDAS; then + DISTRO=trisquelflidas else echo "PARTITIONER ERROR: no distro class/var set" >&2 exit 1 @@ -192,17 +252,10 @@ fi first_boot_dev=${boot_devs[0]} -case ${#boot_devs[@]} in - # need double the space if we are raid 10, and then - # might as well give some extra overhead. - [4-9]*|[1-3]?*) boot_mib=$((boot_mib * 3)) ;; -esac - - bpart() { # btrfs a partition - case ${#@} in - [1-3]) mkfs.btrfs -f $@ ;; - [4-9]*|[1-3]?*) mkfs.btrfs -f -m raid10 -d raid10 $@ ;; + case $raid_level in + 0) mkfs.btrfs -f $@ ;; + 10) mkfs.btrfs -f -m raid10 -d raid10 $@ ;; esac } @@ -216,10 +269,11 @@ if [[ ! -e $luks_dir/host-$HOSTNAME ]]; then exit 1 fi -if ifclass tp; then +lukspw=$(cat $luks_dir/iank) +# # ian: disabled by chaning to tpnew while I use the tp host. +# # note, corresponding changes in /b/ds/keyscript-{on,off} +if ifclass tpnew; then lukspw=$(cat $luks_dir/traci) -else - lukspw=$(cat $luks_dir/ian) fi if ifclass demohost; then lukspw=x @@ -239,23 +293,37 @@ for dev in ${devs[@]}; do done shopt -s nullglob if $partition; then - for dev in ${devs[@]}; do - for x in $dev[0-9]; do - count_down=10 - # wipefs has failed, manual run works, google suggests timing issue - while ! wipefs -a $x; do - sleep 2 - count_down=$((count_down - 1)) - (( count_down > 0 )) || exit 1 + + ### begin wipefs + if [[ ! $SPECIAL_DISK ]]; then + for dev in ${devs[@]}; do + # 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) + [[ -e $x ]] || continue + count_down=10 + # wipefs has failed, manual run works, google suggests timing issue + while ! wipefs -a $x; do + sleep 2 + count_down=$((count_down - 1)) + (( count_down > 0 )) || exit 1 + done done done - done + fi + ### end wipefs + for dev in ${devs[@]}; do + if [[ $SPECIAL_DISK ]]; then + dev=$(devbyid $SPECIAL_DISK) + fi + # parted will round up the disk size. Do -1 so we can have # fully 1MiB unit partitions for easy resizing of the last partition. # Otherwise we would pass in -0 for the end argument for the last partition. # - # parted print error output is expected. example: + # 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)) @@ -265,19 +333,28 @@ if $partition; then 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 - $pcmd mkpart primary "linux-swap" ${root_end}MiB ${swap_end}MiB + $pcmd mkpart primary ext3 12MiB ${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. + $pcmd mkpart primary "" ${root_end}MiB ${swap_end}MiB + $pcmd name $swapn swap $pcmd mkpart primary "" ${swap_end}MiB ${disk_mib}MiB + $pcmd name $bootn boot # 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. $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. $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 # the mkfs failed before on a vm, which prompted me to add @@ -321,6 +398,10 @@ if $partition; then cryptsetup luksOpen `rootdev` `root-cryptname` \ --key-file $luks_dir/host-$HOSTNAME + + if [[ $SPECIAL_DISK ]]; then + exit 0 + fi done ls -la /dev/btrfs-control # this was probably for debugging... sleep 1 @@ -336,7 +417,7 @@ else fi -if [[ $DISTRO != debianstable_bootstrap ]]; then +if [[ $DISTRO != debianstretch_bootstrap ]]; then # bootstrap distro doesn't use separate encrypted root. mount -o subvolid=0 $first_root_crypt /mnt # systemd creates subvolumes we want to delete. @@ -350,21 +431,14 @@ if [[ $DISTRO != debianstable_bootstrap ]]; then cd /mnt btrfs subvolume create root_$DISTRO - [[ -e q ]] || btrfs subvolume create q - chown root:1000 q mkdir -p /mnt/root_$DISTRO/boot - for x in q/a q/i; do - mkdir -p $x - chown 1000:1000 $x - chmod 755 $x - done - # could set default like this, but no reason to. + # could set default subvol like this, but no reason to. # 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, - # (immutable in buzzwords). if it messes up, we will just recreated it, + # 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. @@ -377,11 +451,11 @@ mount -o subvolid=0 $first_boot_dev /mnt cd /mnt btrfs subvolume set-default 0 /mnt # already default, just ensuring it. -# for libreboot systems. +# for libreboot systems. grub2 only reads from subvolid=0 mkdir -p /mnt/grub2 cp $FAI/distro-install-common/libreboot_grub.cfg /mnt/grub2 -if [[ $DISTRO == debianstable_bootstrap ]]; then +if [[ $DISTRO == debianstretch_bootstrap ]]; then # this is just convenience for the libreboot_grub config # so we can glob the other ones easier. boot_vol=$DISTRO @@ -400,7 +474,7 @@ grub-editenv /mnt/grubenv set did_fai_check=true grub-editenv /mnt/grubenv set last_boot=/$boot_vol umount /mnt -if [[ $DISTRO == debianstable_bootstrap ]]; then +if [[ $DISTRO == debianstretch_bootstrap ]]; then cat > /tmp/fai/fstab < /tmp/fai/fstab <> /tmp/fai/fstab <<'EOF' -$first_root_crypt /i btrfs noatime,subvol=i 0 0 -UUID=3f7b31cd-f299-40b4-a86b-7604282e2715 /i btrfs noatime 0 2 -EOF - fi - swaps=() for dev in ${devs[@]}; do swaps+=(`swap-cryptname`)