hopefully fix grub bug

diff --git a/bootloader/efi.sh b/bootloader/efi.sh
index d70f60b..0a16059 100755 (executable)
--- a/bootloader/efi.sh
+++ b/bootloader/efi.sh
@@ -2,7 +2,7 @@
 
 DISK=$(cat /root/instantARCH/config/disk)
 mkdir /efi
-DISK1=$(fdisk -l | grep ^${DISK} | grep -o '^[^ ]*' | head -1)
+DISK1=$(fdisk -l | grep "^${DISK}" | grep -o '^[^ ]*' | head -1)
 
 mount "${DISK1}" /efi
 

diff --git a/bootloader/install.sh b/bootloader/install.sh
index 194d312..9f057d5 100755 (executable)
--- a/bootloader/install.sh
+++ b/bootloader/install.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 echo "installing grub for legacy bios"
 DISK="$(cat /root/instantARCH/config/disk)"
-DISK1=$(fdisk -l | grep ^${DISK} | grep -o '^[^ ]*' | head -1)
+DISK1=$(fdisk -l | grep "^${DISK}" | grep -o '^[^ ]*' |
+    head -1 | grep -o '[^ ]*')
 
+echo "installing grub to $DISK1"
 grub-install --target=i386-pc "${DISK1}" --root /mnt

diff --git a/disk/disk.sh b/disk/disk.sh
index 1f017bc..36c0e20 100755 (executable)
--- a/disk/disk.sh
+++ b/disk/disk.sh
@@ -10,8 +10,8 @@ if efibootmgr; then
 start=        4096, size=      614400, type=ef
 start=618496, type=83, bootable" | sfdisk "${DISK}"
 
-    DISK1=$(fdisk -l | grep ^${DISK} | grep -o '^[^ ]*' | head -1)
-    DISK2=$(fdisk -l | grep ^${DISK} | grep -o '^[^ ]*' | tail -1)
+    DISK1=$(fdisk -l | grep "^${DISK}" | grep -o '^[^ ]*' | head -1)
+    DISK2=$(fdisk -l | grep "^${DISK}" | grep -o '^[^ ]*' | tail -1)
 
     mkfs.fat -F32 "$DISK1"
     mkfs.ext4 -F "$DISK2"
@@ -20,7 +20,7 @@ else
     echo "legacy bios"
     echo "label: dos
 type=83, bootable" | sfdisk "${DISK}"
-    DISK1="$(fdisk -l | grep ^${DISK} | grep -o '^[^ ]*' | head -1)"
+    DISK1="$(fdisk -l | grep "^${DISK}" | grep -o '^[^ ]*' | head -1)"
 
     mkfs.ext4 -F "$DISK1"
 

diff --git a/pacstrap/pacstrap.sh b/pacstrap/pacstrap.sh
index 81db2d2..ca0ea8c 100755 (executable)
--- a/pacstrap/pacstrap.sh
+++ b/pacstrap/pacstrap.sh
@@ -9,7 +9,7 @@ if efibootmgr; then
     mount ${DISK2} /mnt
     mount ${DISK1} /efi
 else
-    DISK1=$(fdisk -l | grep ^${DISK} | grep -o '^[^ ]*' | head -1)
+    DISK1=$(fdisk -l | grep "^${DISK}" | grep -o '^[^ ]*' | head -1)
     mount ${DISK1} /mnt
 fi