add support for efi systems

diff --git a/bootloader/efi.sh b/bootloader/efi.sh
new file mode 100644 (file)
index 0000000..2451e00
--- /dev/null
+++ b/bootloader/efi.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+DISK=$(cat /root/instantARCH/config/disk)
+mkdir /efi
+mount "${DISK}1" /efi
+
+sudo pacman -S efibootmgr grub --noconfirm
+
+grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=GRUB

diff --git a/bootloader/install.sh b/bootloader/install.sh
index 153b0c1..7a71f09 100755 (executable)
--- a/bootloader/install.sh
+++ b/bootloader/install.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
+echo "installing grub for legacy bios"
 grub-install --target=i386-pc "$(cat /root/instantARCH/config/disk)" --root /mnt

diff --git a/disk/disk.sh b/disk/disk.sh
index 52a1902..cfab38b 100755 (executable)
--- a/disk/disk.sh
+++ b/disk/disk.sh
@@ -10,7 +10,7 @@ if efibootmgr; then
 ${DISK}1 : start=        4096, size=      614400, type=ef
 ${DISK}2: start=618496, type=83, bootable" | sfdisk "${DISK}"
 
-    mkfs.fat32 -F ${DISK}1
+    mkfs.fat -F32 ${DISK}1
     mkfs.ext4 -F ${DISK}2
 
 else

diff --git a/systeminstall.sh b/systeminstall.sh
index bbe2b92..73c283a 100755 (executable)
--- a/systeminstall.sh
+++ b/systeminstall.sh
@@ -31,7 +31,11 @@ chrootscript "depend/depend" &&
     chrootscript "lang/timezone"
 
 # grub: install package, install, generate config
-escript bootloader/install
+if efibootmgr; then
+    chrootscript "bootloader/efi"
+else
+    escript bootloader/install
+fi
 
 chrootscript "user/user" &&
     chrootscript "network/network" &&