X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=adb7b629e6b8bc243a323106b6c25247c35e9258;hb=3c98a1230f8c0177d194038ac9c4db70648af792;hp=e2a32caea9814ab497ed8ebb67be80052cdd5fe8;hpb=ce5290b5a6eee95cc59b5c1651d73a224c3d5bbd;p=automated-distro-installer diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index e2a32ca..adb7b62 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -6,48 +6,68 @@ 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 #### begin configuration + +bootn=3 +rootn=1 +swapn=2 +bios_grubn=4 +boot_mib=750 +lastn=$bios_grubn + if ifclass VM; then d=vd else d=sd fi - +letters=() if ifclass TWO_DISK; then letters=(a b) elif ifclass ONE_DISK; then letters=(a) +elif ifclass MANY_DISK; then + for dev in /dev/${d}?; do letters+=(${dev#/dev/${d}}); done else - exit + exit 1 fi ##### end configuration -skiptask partition + + +bpart() { + dev_n=$1 + case ${#@} in + [1-3]) mkfs.btrfs -f $@ ;; + [4-9]*|[1-3]?*) mkfs.btrfs -f -m raid10 -d raid10 $@ ;; + esac +} + devs=(${letters[@]/#//dev/${d}}) crypt_devs=(${letters[@]/#//dev/mapper/crypt_dev_${d}}) +first_boot_dev=${devs[0]}$bootn -# we can set this manually to force partitioning -#partition=false +partition=true # hardcoded for now # somewhat crude detection of whether to partition for dev in ${devs[@]}; do x=($dev[0-9]) - [[ ${#x[@]} == 4 ]] || partition=true - for part in ${dev}{1,2,3,4}; do - [[ -e $part ]] || partition=true + [[ ${#x[@]} == ${lastn} ]] || partition=true + for (( i=1; i <= $lastn; i++ )); do + [[ -e ${dev}$i ]] || partition=true done - # type tells us it's not totally blank - for part in ${dev}{1,3}; do - blkid | grep "^$part:.*TYPE=" &>/dev/null || partition=true + for part in $dev$rootn $dev$bootn; do + # type tells us it's not totally blank + blkid | grep "^${part}:.*TYPE=" &>/dev/null || partition=true done done -partition=true # override temporarily +#partition=true # for temporarily override # keyfiles generated like: # head -c 2048 /dev/urandom | od | s dd of=/q/root/luks/host-demohost -luks_dir=/var/lib/fai/config/distro-install-common/luks +luks_dir=${LUKS_DIR:-/var/lib/fai/config/distro-install-common/luks} if ifclass tp; then lukspw=$(cat $luks_dir/traci) else @@ -57,79 +77,67 @@ if ifclass demohost; then lukspw=x fi -boot_end=504 - -crypt=/dev/mapper/crypt_dev_${d##/dev/}a3 - +crypt=/dev/mapper/crypt_dev_${d##/dev/}a$rootn +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_end=$(( $(grep ^MemTotal: /proc/meminfo| awk '{print $2}') * 3/(${#devs[@]} * 2 ) / 1000 + boot_end )) - -create_subvols() { - cd /mnt - for x in a home root; do - btrfs subvolume list . | grep "$x$" >/dev/null || btrfs subvolume create $x - done - btrfs subvolume set-default \ - $(btrfs subvolume list . | grep 'root$' | awk '{print $2}') . - cd / - umount /mnt -} - +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 - mkdir -p /tmp/fai for dev in ${devs[@]}; do for x in $dev[0-9]; do wipefs -a $x; 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 set 1 boot on - 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 4 bios_grub on + # 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 - mkfs.btrfs -f ${crypt_devs[@]/%/3} - parted ${devs[0]} set 1 boot on + bpart ${crypt_devs[@]/%/$rootn} mount $crypt /mnt - create_subvols 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 @@ -140,34 +148,62 @@ else for subvol in ${s[@]}; do btrfs subvolume delete /mnt/$subvol; done btrfs subvolume set-default 0 /mnt btrfs subvolume delete /mnt/root - create_subvols fi +bpart ${devs[@]/%/$bootn} -for dev in ${devs[@]}; do - cat >>/tmp/fai/crypttab </dev/null || btrfs subvolume create $x done - -for dev in ${devs[@]}; do - cat >>/tmp/fai/crypttab < /tmp/fai/fstab <>/tmp/fai/crypttab <> /tmp/fai/fstab </tmp/fai/disk_var.sh <