Skip to content

OXT-1372: installer: Amend disk/partition for efibootmgr #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jean-edouard merged 1 commit into from
Jul 9, 2018
Merged

OXT-1372: installer: Amend disk/partition for efibootmgr #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions common/stages/Functions/library
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
5 changes: 3 additions & 2 deletions part2/stages/Functions/install-main
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,8 +555,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

Expand Down