From 8b3517be28d2b94014140d3635fce6ecd0105bab Mon Sep 17 00:00:00 2001
From: lub <git@lubiland.de>
Date: Sat, 21 Dec 2019 00:52:44 +0100
Subject: [PATCH] switch to efi boot

---
 hardware/ovh/grub.sh          |  5 -----
 hardware/ovh_rise-1/grub.sh   |  5 -----
 hardware/ovh_rise-1/parted.sh | 18 +++++++++++++-----
 hardware/test-vm/grub.sh      |  5 -----
 post-debootstrap-installer.sh |  2 +-
 5 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100755 hardware/ovh/grub.sh
 delete mode 100755 hardware/ovh_rise-1/grub.sh
 delete mode 100755 hardware/test-vm/grub.sh

diff --git a/hardware/ovh/grub.sh b/hardware/ovh/grub.sh
deleted file mode 100755
index f0560ad..0000000
--- a/hardware/ovh/grub.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-
-grub-install /dev/sda
-grub-install /dev/sdb
diff --git a/hardware/ovh_rise-1/grub.sh b/hardware/ovh_rise-1/grub.sh
deleted file mode 100755
index 95f3b5a..0000000
--- a/hardware/ovh_rise-1/grub.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-
-grub-install /dev/nvme0n1
-grub-install /dev/nvme1n1
diff --git a/hardware/ovh_rise-1/parted.sh b/hardware/ovh_rise-1/parted.sh
index 0753cb1..19a6efd 100755
--- a/hardware/ovh_rise-1/parted.sh
+++ b/hardware/ovh_rise-1/parted.sh
@@ -2,16 +2,24 @@
 set -e
 
 
-# root 440GB
-# boot 2GB
-# free 5GB
+# / 440GB
+# /boot 2GB
+# /boot/efi 1GB
+# free 7GB
 
-parted /dev/nvme0n1 mklabel msdos
+parted /dev/nvme0n1 mklabel gpt
 parted /dev/nvme0n1 mkpart primary 1 440GB
 parted /dev/nvme0n1 mkpart primary 440GB 442GB
-parted /dev/nvme1n1 mklabel msdos
+parted /dev/nvme0n1 mkpart primary 442GB 443GB
+# set flag for ESP
+parted /dev/nvme0n1 set 3 boot on
+
+parted /dev/nvme1n1 mklabel gpt
 parted /dev/nvme1n1 mkpart primary 1 440GB
 parted /dev/nvme1n1 mkpart primary 440GB 442GB
+parted /dev/nvme1n1 mkpart primary 442GB 443GB
+# set flag for ESP
+parted /dev/nvme1n1 set 3 boot on
 
 sleep 1
 
diff --git a/hardware/test-vm/grub.sh b/hardware/test-vm/grub.sh
deleted file mode 100755
index 4a92fe9..0000000
--- a/hardware/test-vm/grub.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-
-grub-install /dev/vda
-grub-install /dev/vdb
diff --git a/post-debootstrap-installer.sh b/post-debootstrap-installer.sh
index cc50a02..d36b6b8 100755
--- a/post-debootstrap-installer.sh
+++ b/post-debootstrap-installer.sh
@@ -32,7 +32,7 @@ sed -i 's/DROPBEAR_PORT=.*/DROPBEAR_PORT=222/' /etc/default/dropbear
 # after cryptsetup, mdadm, ... because of update-initramfs
 apt-get -y install linux-image-amd64
 
-DEBIAN_FRONTEND=noninteractive apt-get -y install grub-pc
+apt-get -y install grub-efi-amd64
 "/hardware-setup/hardware/$1/grub.sh"
 update-grub