X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=f241fd608f3c8c72524e6c1b3ab9097cd78b2e7b;hb=a027429011d313e0d9156fef9451f5a55a588163;hp=9905602cab65a4108057e488a06a507a1ca954b5;hpb=d6df8985152a6c17523cedc3fee62694544eeaf2;p=automated-distro-installer diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index 9905602..f241fd6 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -31,13 +31,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 +69,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 +77,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 "$@"; fi + done +} ##### end function defs @@ -99,7 +109,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 +120,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,16 +183,27 @@ 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 + if ifclass VOL_STABLE_BOOTSTRAP; then DISTRO=debianstable_bootstrap - elif ifclass STRETCH64; then + elif ifclass VOL_STRETCH; then DISTRO=debiantesting - elif ifclass STABLE; then + elif ifclass VOL_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 else echo "PARTITIONER ERROR: no distro class/var set" >&2 @@ -192,17 +213,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 } @@ -240,7 +254,11 @@ done shopt -s nullglob if $partition; then for dev in ${devs[@]}; do - for x in $dev[0-9]; 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 @@ -350,21 +368,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,7 +388,7 @@ 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 @@ -409,22 +420,12 @@ BOOT_DEVICE="${short_devs[@]}" ROOT_PARTITION=$first_boot_dev EOF else - # note, the mount point /a seems to get automatically created somewhere + # note, fai creates the mountpoints listed here cat > /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`)