X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=ca7b86dbcd31f399fddc7b722cf018e36f20a196;hb=e499b43b888c951fd4c255b2853f0af2350400c4;hp=46887e9712d1aa558fb08bcab3be976a4fce6723;hpb=43480add5b3ab6f4e407065454bd6be1d1fe1870;p=automated-distro-installer diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index 46887e9..ca7b86d 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -31,12 +31,17 @@ 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 +# 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 @@ -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 @@ -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 @@ -185,16 +195,18 @@ fi if [[ ! $DISTRO ]]; then - if ifclass STABLE_BOOTSTRAP; then - DISTRO=debianstable_bootstrap - elif ifclass STRETCH64; then + if ifclass VOL_STRETCH_BOOTSTRAP; then + DISTRO=stretch_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 @@ -223,7 +235,7 @@ fi if ifclass tp; then lukspw=$(cat $luks_dir/traci) else - lukspw=$(cat $luks_dir/ian) + lukspw=$(cat $luks_dir/iank) fi if ifclass demohost; then lukspw=x @@ -273,19 +285,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 @@ -344,7 +365,7 @@ else fi -if [[ $DISTRO != debianstable_bootstrap ]]; then +if [[ $DISTRO != stretch_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. @@ -358,21 +379,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. @@ -385,11 +399,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 == stretch_bootstrap ]]; then # this is just convenience for the libreboot_grub config # so we can glob the other ones easier. boot_vol=$DISTRO @@ -408,7 +422,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 == stretch_bootstrap ]]; then cat > /tmp/fai/fstab < /tmp/fai/fstab <