From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 21 Sep 2015 01:26:21 +0000 (-0300)
Subject: Set proper /boot device at fstab during provision
X-Git-Tag: 0.2.4~298
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=acf9da7a8f8c4d322a3748d56abcb788fd36b28f;p=hydra.git

Set proper /boot device at fstab during provision
---

diff --git a/share/hydractl/provision b/share/hydractl/provision
index 9bd8aac..e2ebbd9 100755
--- a/share/hydractl/provision
+++ b/share/hydractl/provision
@@ -150,6 +150,7 @@ hydra_safe_run parted -s -- $device set 3 lvm  on
 # Use absolute paths for devices.
 boot_device="$device"2
 syst_device="$device"3
+reboot_device="`blkid | grep ^$boot_device: | cut -d ' ' -f 2 | sed -e 's/"//g'`"
 
 # Create volumes.
 echo "Creating the needed disk volumes..."
@@ -366,7 +367,7 @@ if [ "$grub" == "y" ]; then
   echo "Boot device setup..."
   hydra_safe_run mkfs.ext4 $boot_device
   hydra_safe_run mount $boot_device /tmp/debootstrap/boot
-  echo "$boot_device /boot ext4 defaults,errors=remount-ro 0 2" >> /tmp/debootstrap/etc/fstab
+  echo "$reboot_device /boot ext4 defaults,errors=remount-ro 0 2" >> /tmp/debootstrap/etc/fstab
 
   echo "Setting up GRUB..."
   hydra_safe_run chroot /tmp/debootstrap/ apt-get install grub-pc -y