X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=0dbc3769d3388219e49143253f79c19a9bc97c7b;hb=9ff459d81a21b8154340752d20288104c50b798c;hp=e3cd178e173f0970e73d50de27b656d80e07e29c;hpb=a129832a849aa87163b866982c214bbdd7314a52;p=automated-distro-installer diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index e3cd178..0dbc376 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -6,151 +6,222 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR # # fai's setup-storage won't do btrfs on luks, # # so we do it ourself :) -partition=false +skiptask partition || ! type skiptask # for running not in fai +#### begin configuration -letters=(a) +bootn=3 +rootn=1 +swapn=2 +bios_grubn=4 +boot_mib=750 +lastn=$bios_grubn if ifclass VM; then - d=/dev/vd + d=vd else - d=/dev/sd + d=sd fi +letters=() if ifclass TWO_DISK; then - skiptask partition - devs=(${d}{a,b}) - [[ -e /dev/md127 ]] || partition=true + letters=(a b) elif ifclass ONE_DISK; then - skiptask partition - devs=(${d}a) + letters=(a) +elif ifclass MANY_DISK; then + for dev in /dev/${d}?; do letters+=(${dev#/dev/${d}}); done else - exit + exit 1 fi -# somewhat crude detection of wehter to partition +if [[ ! $DISTRO ]]; then + if ifclass STABLE; then + DISTRO=debianjessie + else + DISTRO=debiantesting + fi +fi + +##### end configuration + + +bpart() { # btrfs a partition + 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 + +partition=true # hardcoded for now + +# somewhat crude detection of whether to partition for dev in ${devs[@]}; do - for part in ${dev}{1,2,3,4}; do - [[ -e $part ]] || partition=true + x=($dev[0-9]) + [[ ${#x[@]} == ${lastn} ]] || partition=true + for (( i=1; i <= $lastn; i++ )); do + [[ -e ${dev}$i ]] || partition=true + done + 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 # 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 lukspw=$(cat $luks_dir/ian) fi - -boot_end=504 - -! ifclass tp || letters=(a b) - -md() { ((${#letters[@]} > 1)); } - -if md; then - # if partition with md0, then reboot into the installer, - # it becomes md127. So might as well start with 127 for simplicity. - crypt=md127 -else - crypt=${d##/dev/}a3 +if ifclass demohost; then + lukspw=x fi +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/(${#letters[@]} * 2 ) / 1000 + boot_end ))MiB - -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/md*; do [[ -d $x ]] || mdadm --stop $x; done - 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 set 1 boot on - parted -s $dev mkpart primary "linux-swap" ${boot_end}MiB $swap_end - parted -s -- $dev mkpart primary "" $swap_end -0 - parted -s $dev set 3 raid on - 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 - done - if md; then - yes | mdadm --create /dev/$crypt --level=raid0 --force --run \ - --raid-devices=${#devs[@]} ${devs[@]/%/3} || [[ $? == 141 ]] - fi - yes YES | cryptsetup luksFormat /dev/$crypt $luks_dir/host-$HOSTNAME \ - -c aes-cbc-essiv:sha256 -s 256 || [[ $? == 141 ]] - yes "$lukspw" cryptsetup luksAddKey --key-file \ - $luks_dir/host-$HOSTNAME /dev/$crypt || [[ $? == 141 ]] - # this would remove the keyfile. we will do that manually later. - # yes 'test' | cryptsetup luksRemoveKey /dev/... \ - # /key/file || [[ $? == 141 ]] - cryptsetup luksOpen /dev/$crypt crypt_dev_$crypt --key-file \ - $luks_dir/host-$HOSTNAME - parted ${devs[0]} set 1 boot on - mkfs.btrfs -f /dev/mapper/crypt_dev_$crypt - mount /dev/mapper/crypt_dev_$crypt /mnt - create_subvols + 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. + # + # 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 ${crypt_devs[@]/%/$rootn} + bpart ${devs[@]/%/$bootn} else for dev in ${devs[@]}; do - mkfs.ext4 -F ${dev}1 + cryptsetup luksOpen $dev$rootn crypt_dev_${dev##/dev/}$rootn \ + --key-file $luks_dir/host-$HOSTNAME || [[ $? == 141 ]] done - yes "$lukspw" | \ - cryptsetup luksOpen /dev/$crypt crypt_dev_$crypt || [[ $? == 141 ]] sleep 1 - mount -o subvolid=0 /dev/mapper/crypt_dev_$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 - create_subvols fi -cat > /tmp/fai/crypttab <> /tmp/fai/crypttab </dev/null || btrfs subvolume create $x +done +for x in root/a q/a; do + mkdir -p $x + chown 1000:1000 $x + chmod 755 $x done +btrfs subvolume set-default \ + $(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 ## + + -# this is duplicated in arch-init cat > /tmp/fai/fstab <>/tmp/fai/crypttab <> /tmp/fai/fstab </tmp/fai/disk_var.sh <