make fstab more flexible

config/etc/fstab

@@ -3,6 +3,6 @@
 #
 # <file system> <dir>   <type>  <options>       <dump>  <pass>
 
-/dev/mapper/md0-unlocked / btrfs relatime 0 0
-/dev/md1 /boot btrfs relatime 0 0
+UUID=%root_uuid% / btrfs relatime 0 0
+UUID=%boot_uuid% /boot btrfs relatime 0 0
 UUID=%esp_uuid% /boot/efi vfat relatime 0 0

hardware/ovh_rise-1/boot

@@ -0,0 +1 @@
+/dev/md1

hardware/ovh_rise-1/root

@@ -0,0 +1 @@
+/dev/md0

post-debootstrap-installer.sh

@@ -42,8 +42,12 @@ apt-get -y install grub-efi-amd64
 update-grub
 grub-install
 
-# edit esp_uuid in fstab
+# edit uuids in fstab
+root_uuid=$(blkid --output value "/dev/mapper/root-unlocked" | head -n1)
+boot_uuid=$(blkid --output value "/hardware-setup/hardware/${1}/boot" | head -n1)
 esp_uuid=$(blkid --output value "/hardware-setup/hardware/${1}/esp" | head -n1)
+sed -i "s/%root_uuid%/${root_uuid}/" /etc/fstab
+sed -i "s/%boot_uuid%/${boot_uuid}/" /etc/fstab
 sed -i "s/%esp_uuid%/${esp_uuid}/" /etc/fstab
 
 

setup.sh

@@ -5,36 +5,39 @@ set -e
 apt-get -y install mdadm cryptsetup debootstrap
 
 # returns /dev/md0 as root device
-# returns /dev/md1 as boot device
+# returns "$boot" as boot device
 "./hardware/${1}/parted.sh" "$2"
+root="hardware/${1}/root"
+boot="hardware/${1}/boot"
+esp="hardware/${1}/esp"
 
 # encrypt and unlock root device
 echo -n 'Enter luks password: '
-read -s md0pwd
+read -s root_pwd
 echo #to indicate progress after password prompt
-echo -n $md0pwd | cryptsetup -q luksFormat /dev/md0
-echo -n $md0pwd | cryptsetup open --type luks /dev/md0 md0-unlocked
-unset md0pwd
+echo -n $root_pwd | cryptsetup -q luksFormat "$root"
+echo -n $root_pwd | cryptsetup open --type luks "$root" root-unlocked
+unset root_pwd
 
 
 # format
 
-chroot=/mnt/md0-unlocked
+chroot=/mnt/root-unlocked
 
 # root device
-mkfs.btrfs /dev/mapper/md0-unlocked
-mkdir /mnt/md0-unlocked
-mount /dev/mapper/md0-unlocked /mnt/md0-unlocked
+mkfs.btrfs /dev/mapper/root-unlocked
+mkdir /mnt/root-unlocked
+mount /dev/mapper/root-unlocked /mnt/root-unlocked
 
 # boot device
-mkfs.btrfs /dev/md1
+mkfs.btrfs "$boot"
 mkdir "$chroot/boot"
-mount /dev/md1 "$chroot/boot"
+mount "$boot" "$chroot/boot"
 
 # esp device
-mkfs.fat "hardware/${1}/esp"
+mkfs.fat "$esp"
 mkdir "$chroot/boot/efi"
-mount "hardware/${1}/esp" "$chroot/boot/efi"
+mount "$esp" "$chroot/boot/efi"
 
 
 # debootstrap