X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=0dbc3769d3388219e49143253f79c19a9bc97c7b;hb=9ff459d81a21b8154340752d20288104c50b798c;hp=c45c4dc67a0917002d3393d6a84b3dd65d354e66;hpb=dbca9252a2039a851af5358ff866478135ae3ccc;p=automated-distro-installer diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index c45c4dc..0dbc376 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -6,15 +6,15 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR # # fai's setup-storage won't do btrfs on luks, # # so we do it ourself :) -skiptask partition ||: # for running out of fai +skiptask partition || ! type skiptask # for running not in fai #### begin configuration -bootn=1 +bootn=3 +rootn=1 swapn=2 -rootn=3 bios_grubn=4 -boot_end=804 +boot_mib=750 lastn=$bios_grubn if ifclass VM; then @@ -33,10 +33,19 @@ elif ifclass MANY_DISK; then else exit 1 fi + +if [[ ! $DISTRO ]]; then + if ifclass STABLE; then + DISTRO=debianjessie + else + DISTRO=debiantesting + fi +fi + ##### end configuration -bpart() { +bpart() { # btrfs a partition dev_n=$1 case ${#@} in [1-3]) mkfs.btrfs -f $@ ;; @@ -46,8 +55,9 @@ bpart() { devs=(${letters[@]/#//dev/${d}}) crypt_devs=(${letters[@]/#//dev/mapper/crypt_dev_${d}}) +first_boot_dev=${devs[0]}$bootn -partition=true +partition=true # hardcoded for now # somewhat crude detection of whether to partition for dev in ${devs[@]}; do @@ -79,85 +89,89 @@ fi crypt=/dev/mapper/crypt_dev_${d##/dev/}a$rootn - -if ifclass frodo; then - # next upgrade is prolly 16 gigs of memory, across ~8 devices - swap_end=$((3500 + boot_end)) -else - # 1.5 x based on https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Installation_Guide/sect-disk-partitioning-setup-x86.html#sect-custom-partitioning-x86 - swap_end=$(( $(grep ^MemTotal: /proc/meminfo| awk '{print $2}') * 3/(${#devs[@]} * 2 ) / 1000 + boot_end )) -fi +bios_grub_end=4 +# 1.5 x based on https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Installation_Guide/sect-disk-partitioning-setup-x86.html#sect-custom-partitioning-x86 +swap_mib=$(( $(grep ^MemTotal: /proc/meminfo | \ + awk '{print $2}') * 3/(${#devs[@]} * 2 ) / 1024 )) +# 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. +disk_mib=$(( $(parted -m ${devs[0]} unit MiB print | \ + sed -nr "s#^${devs[0]}:([0-9]+).*#\1#p") - 1)) +root_end=$(( disk_mib - swap_mib - boot_mib )) +swap_end=$(( root_end + swap_mib)) mkdir -p /tmp/fai shopt -s nullglob if $partition; then for dev in ${devs[@]}; do - for x in $dev[0-9]; do wipefs -a $x; done + 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 + done + done done for dev in ${devs[@]}; do parted -s $dev mklabel gpt - # gpt ubuntu cloud image uses ~4. fai uses 1 MiB. ehh, i'll do 4. - # also, using MB instead of MiB causes complains about alignment. - parted -s $dev mkpart primary "ext3" 4MB ${boot_end}MiB - parted -s $dev mkpart primary "linux-swap" ${boot_end}MiB ${swap_end}MiB - parted -s -- $dev mkpart primary "" ${swap_end}MiB -0 - parted -s $dev mkpart primary "" 1MiB 4MiB - parted -s $dev set $bios_grubn bios_grub on - parted -s $dev set $bootn boot on # generally not needed on modern systems + # gpt ubuntu cloud image uses ~4. fai uses 1 MiB. + # I read something in the parted manual saying cheap flash media + # likes to start at 4. + # MiB because parted complains about alignment otherwise. + pcmd="parted -a optimal -s -- $dev" + $pcmd mkpart primary "ext3" 4MiB ${root_end}MiB + $pcmd mkpart primary "linux-swap" ${root_end}MiB ${swap_end}MiB + $pcmd mkpart primary "" ${swap_end}MiB ${disk_mib}MiB + $pcmd mkpart primary "" 1MiB 4MiB + $pcmd set $bios_grubn bios_grub on + $pcmd set $bootn boot on # generally not needed on modern systems # the mkfs failed randomly on a vm, so I threw a sleep in here. sleep .1 - mkfs.ext4 -F ${dev}1 - # 3 is device which simply holds a key for the 4's, - # so we can unlock multi-device btrfs fs with 1 manually entered passphrase. - # - # Background: It's of course possible modify the initramfs to - # put the input from a passphrase prompt into a variable and use - # it to unlock multiple devices, but that would require figuring - # more things out. + + luks_dev=$dev$rootn + yes YES | cryptsetup luksFormat $luks_dev $luks_dir/host-$HOSTNAME \ + -c aes-cbc-essiv:sha256 -s 256 || [[ $? == 141 ]] + yes "$lukspw" | \ + cryptsetup luksAddKey --key-file $luks_dir/host-$HOSTNAME \ + $luks_dev || [[ $? == 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. # - for luks_dev in ${dev}3; do - yes YES | cryptsetup luksFormat $luks_dev $luks_dir/host-$HOSTNAME \ - -c aes-cbc-essiv:sha256 -s 256 || [[ $? == 141 ]] - yes "$lukspw" | \ - cryptsetup luksAddKey --key-file $luks_dir/host-$HOSTNAME \ - $luks_dev || [[ $? == 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 $luks_dev crypt_dev_${luks_dev##/dev/} \ - --key-file $luks_dir/host-$HOSTNAME - done + # This would remove the keyfile. + # yes 'test' | cryptsetup luksRemoveKey /dev/... \ + # /key/file || [[ $? == 141 ]] + + cryptsetup luksOpen $luks_dev crypt_dev_${luks_dev##/dev/} \ + --key-file $luks_dir/host-$HOSTNAME done - #bpart ${devs[@]/%/$rootn} - bpart ${crypt_devs[@]/%/3} - parted ${devs[0]} set 1 boot on - mount $crypt /mnt + bpart ${crypt_devs[@]/%/$rootn} + bpart ${devs[@]/%/$bootn} else for dev in ${devs[@]}; do - mkfs.ext4 -F ${dev}1 - cryptsetup luksOpen ${dev}3 crypt_dev_${dev##/dev/}3 \ + cryptsetup luksOpen $dev$rootn crypt_dev_${dev##/dev/}$rootn \ --key-file $luks_dir/host-$HOSTNAME || [[ $? == 141 ]] done sleep 1 - mount -o subvolid=0 $crypt /mnt - # systemd creates subvolumes we want to delete. - s=($(btrfs subvolume list --sort=-path /mnt | - sed -rn 's#^.*path\s*(root/\S+)\s*$#\1#p')) - for subvol in ${s[@]}; do btrfs subvolume delete /mnt/$subvol; done - btrfs subvolume set-default 0 /mnt - btrfs subvolume delete /mnt/root fi +mount -o subvolid=0 $crypt /mnt +# systemd creates subvolumes we want to delete. +s=($(btrfs subvolume list --sort=-path /mnt | + sed -rn "s#^.*path\s*(root_$DISTRO/\S+)\s*\$#\1#p")) +for subvol in ${s[@]}; do btrfs subvolume delete /mnt/$subvol; done +btrfs subvolume set-default 0 /mnt +[[ ! -e /mnt/root_$DISTRO ]] || btrfs subvolume delete /mnt/root_$DISTRO + + ## create subvols ## cd /mnt -for x in q home root; do +for x in q home_$DISTRO root_$DISTRO; do btrfs subvolume list . | grep "$x$" >/dev/null || btrfs subvolume create $x done for x in root/a q/a; do @@ -166,23 +180,30 @@ for x in root/a q/a; do chmod 755 $x done btrfs subvolume set-default \ - $(btrfs subvolume list . | grep 'root$' | awk '{print $2}') . + $(btrfs subvolume list . | grep "root_$DISTRO$" | awk '{print $2}') . chattr -Rf +C root cd / umount /mnt +mount $first_boot_dev /mnt +cd /mnt +[[ ! -e /mnt/boot_$DISTRO ]] || btrfs subvolume delete /mnt/boot_$DISTRO +btrfs subvolume create boot_$DISTRO +btrfs subvolume set-default \ + $(btrfs subvolume list . | grep "boot_$DISTRO$" | awk '{print $2}') . +cd / +umount /mnt ## end create subvols ## cat > /tmp/fai/fstab </tmp/fai/disk_var.sh <