#### 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
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
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
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
+ bpart ${crypt_devs[@]/%/$rootn}
mount $crypt /mnt
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
btrfs subvolume set-default 0 /mnt
btrfs subvolume delete /mnt/root
fi
+bpart ${devs[@]/%/$bootn}
+
## create subvols ##
cd /mnt
chattr -Rf +C root
cd /
umount /mnt
+mount $first_boot_dev /mnt
+cd /mnt
+btrfs subvolume create boot
+btrfs subvolume set-default \
+ $(btrfs subvolume list . | grep 'boot$' | awk '{print $2}') .
+cd /
+umount /mnt
## end create subvols ##
$crypt /q btrfs noatime,subvol=/q 0 0
/q/a /a none bind 0 0
$crypt /home btrfs noatime,subvol=/home 0 0
-${devs[0]}1 /boot ext4 noatime 0 2
+$first_boot_dev /boot btrfs noatime,subvol=/boot 0 0
EOF
-
swaps=()
for dev in ${devs[@]}; do
s=crypt_swap_${dev##/dev/}$swapn
# swaplist seems to do nothing.
cat >/tmp/fai/disk_var.sh <<EOF
ROOT_PARTITION=\${ROOT_PARTITION:-$crypt}
-BOOT_PARTITION=\${BOOT_PARTITION:-${devs[0]}1}
+BOOT_PARTITION=\${BOOT_PARTITION:-$first_boot_dev}
BOOT_DEVICE=\${BOOT_DEVICE:-"${devs[0]}"}
SWAPLIST=\${SWAPLIST:-"${swaps[@]}"}
EOF