From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 17 Aug 2018 23:10:02 +0000 (-0300)
Subject: Provision: move boot device setup a bit to the top
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8fa354282060ffc3bdd5901636e1d2686da12c59;p=hydra.git

Provision: move boot device setup a bit to the top
---

diff --git a/share/hydractl/provision b/share/hydractl/provision
index 192ae69..cabb40e 100755
--- a/share/hydractl/provision
+++ b/share/hydractl/provision
@@ -449,6 +449,14 @@ EOF
   fi
 fi
 
+# Boot device must be available before installing kernel and initramfs.
+if [ "$grub" == "y" ] && [ "$encrypt" != "y" ]; then
+  echo "Boot device setup..."
+  hydra_sudo_run mkfs.ext4 $boot_device
+  hydra_sudo_run mount $boot_device $WORK/boot
+  echo "$reboot_device /boot ext4 defaults,errors=remount-ro 0 2" | $SUDO tee -a $WORK/etc/fstab > /dev/null
+fi
+
 # Kernel.
 echo "Installing kernel..."
 cat <<-EOF | $SUDO tee $WORK/etc/initramfs-tools/modules > /dev/null
@@ -469,14 +477,6 @@ else
   kernel_arch="$arch"
 fi
 
-# Boot device must be available before installing kernel and initramfs.
-if [ "$grub" == "y" ] && [ "$encrypt" != "y" ]; then
-  echo "Boot device setup..."
-  hydra_sudo_run mkfs.ext4 $boot_device
-  hydra_sudo_run mount $boot_device $WORK/boot
-  echo "$reboot_device /boot ext4 defaults,errors=remount-ro 0 2" | $SUDO tee -a $WORK/etc/fstab > /dev/null
-fi
-
 # Kernel.
 $APT_INSTALL linux-image-$kernel_arch -y