From bca4251bfc8de1fa77384e4c7cf592cfef28e9ca Mon Sep 17 00:00:00 2001
From: lub <git@lubiland.de>
Date: Sat, 21 Dec 2019 07:07:22 +0100
Subject: [PATCH] add esp setup

---
 config/etc/fstab              | 1 +
 hardware/ovh_rise-1/esp       | 1 +
 post-debootstrap-installer.sh | 7 +++++--
 setup.sh                      | 5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 120000 hardware/ovh_rise-1/esp

diff --git a/config/etc/fstab b/config/etc/fstab
index ba25a2b..23aba7e 100644
--- a/config/etc/fstab
+++ b/config/etc/fstab
@@ -5,3 +5,4 @@
 
 /dev/mapper/md0-unlocked / btrfs relatime 0 0
 /dev/md1 /boot btrfs relatime 0 0
+UUID=%esp_uuid% /boot/efi fat relatime 0 0
diff --git a/hardware/ovh_rise-1/esp b/hardware/ovh_rise-1/esp
new file mode 120000
index 0000000..09d1323
--- /dev/null
+++ b/hardware/ovh_rise-1/esp
@@ -0,0 +1 @@
+/dev/nvme0n1p3
\ No newline at end of file
diff --git a/post-debootstrap-installer.sh b/post-debootstrap-installer.sh
index d36b6b8..8b6be7f 100755
--- a/post-debootstrap-installer.sh
+++ b/post-debootstrap-installer.sh
@@ -33,8 +33,11 @@ sed -i 's/DROPBEAR_PORT=.*/DROPBEAR_PORT=222/' /etc/default/dropbear
 apt-get -y install linux-image-amd64
 
 apt-get -y install grub-efi-amd64
-"/hardware-setup/hardware/$1/grub.sh"
-update-grub
+
+# edit esp_uuid in fstab
+esp_uuid=$(blkid --output value "/hardware-setup/hardware/${1}/esp" | head -n1)
+sed -i "s/%esp_uuid%/${esp_uuid}/" /etc/fstab
+
 
 ### users
 
diff --git a/setup.sh b/setup.sh
index c5abedc..8c4554d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -31,6 +31,11 @@ mkfs.btrfs /dev/md1
 mkdir "$chroot/boot"
 mount /dev/md1 "$chroot/boot"
 
+# esp device
+mkfs.fat "hardware/${1}/esp"
+mkdir "$chroot/boot/efi"
+mount "hardware/${1}/esp" "$chroot/boot/efi"
+
 
 # debootstrap