if [[ ! $DISTRO ]]; then
- if ifclass VOL_STABLE_BOOTSTRAP; then
- DISTRO=debianstable_bootstrap
+ if ifclass VOL_STRETCH_BOOTSTRAP; then
+ DISTRO=stretch_bootstrap
elif ifclass VOL_STRETCH; then
- DISTRO=debiantesting
- elif ifclass VOL_STABLE; then
- DISTRO=debianstable
+ DISTRO=debianstretch
elif ifclass VOL_XENIAL; then
DISTRO=ubuntuxenial
elif ifclass VOL_BELENOS; 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
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.
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
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 <<EOF
$first_boot_dev / btrfs noatime,subvol=$boot_vol 0 0
EOF