Merge pull request #93 from eric-ch/stable-8-oxt-1372

STABLE-8: OXT-1372: installer: Amend disk/partition for efibootmgr
OpenXT · Jul 9, 2018 · 27d8ecc · 27d8ecc
2 parents 029fb9d + 231464c
commit 27d8ecc
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/common/stages/Functions/library b/common/stages/Functions/library
@@ -396,3 +396,30 @@ reread_partition_table()
     udevadm settle >&2
 }
 
+#-----------------------------------------------------------
+# Usage: get_devnode_disk /dev/(sd[a-z]\+[0-9]\+|/dev/nvme[0-9]\+n[0-9]\+p[0-9]\+)
+# Prints the disk component of the argument devnode on stdout.
+get_devnode_disk() {
+    local devnode="$1"
+    local disk
+
+    case "${devnode}" in
+        "/dev/nvme"*) disk="${devnode%p*}" ;;
+        "/dev/sd"*)   disk="${devnode%%[!/a-z]*}" ;;
+    esac
+    echo "${disk}"
+}
+
+#-----------------------------------------------------------
+# Usage: get_devnode_partition /dev/(sd[a-z]\+[0-9]\+|/dev/nvme[0-9]\+n[0-9]\+p[0-9]\+)
+# Prints the partition component of the argument devnode on stdout.
+get_devnode_partition() {
+    local devnode="$1"
+    local part
+
+    case "${devnode}" in
+        "/dev/nvme"*"p"*) part="${devnode##*nvme*n*p}" ;;
+        "/dev/sd"*)       part="${devnode##*/sd*[!0-9]}" ;;
+    esac
+    echo "${part}"
+}
diff --git a/part2/stages/Functions/install-main b/part2/stages/Functions/install-main
@@ -540,8 +540,9 @@ remove_efi_boot_entries()
 
 create_efi_boot_entries()
 {
-    local DISK_DEV="$( echo ${1} | sed -e 's/[[:digit:]]*$//' )"
-    local PART="${1#$DISK_DEV}"
+    local DEVNODE="$1"
+    local DISK_DEV="$(get_devnode_disk ${DEVNODE})"
+    local PART="$(get_devnode_partition ${DEVNODE})"
 
     remove_efi_boot_entries