Merge "Ironic: uefi localboot support"
This commit is contained in:
commit
e70ffdd15e
@ -2,3 +2,4 @@ curl
|
|||||||
tgtadm
|
tgtadm
|
||||||
tgtd
|
tgtd
|
||||||
partprobe
|
partprobe
|
||||||
|
lsblk
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
readonly IRONIC_API_URL=$(get_kernel_parameter ironic_api_url)
|
readonly IRONIC_API_URL=$(get_kernel_parameter ironic_api_url)
|
||||||
readonly IRONIC_BOOT_OPTION=$(get_kernel_parameter boot_option)
|
readonly IRONIC_BOOT_OPTION=$(get_kernel_parameter boot_option)
|
||||||
|
readonly IRONIC_BOOT_MODE=$(get_kernel_parameter boot_mode)
|
||||||
|
|
||||||
if [ -z "$ISCSI_TARGET_IQN" ]; then
|
if [ -z "$ISCSI_TARGET_IQN" ]; then
|
||||||
err_msg "iscsi_target_iqn is not defined"
|
err_msg "iscsi_target_iqn is not defined"
|
||||||
@ -79,6 +80,21 @@ if [ "$IRONIC_BOOT_OPTION" = "local" ]; then
|
|||||||
mount -o bind /sys $root_part_mount/sys
|
mount -o bind /sys $root_part_mount/sys
|
||||||
mount -o bind /proc $root_part_mount/proc
|
mount -o bind /proc $root_part_mount/proc
|
||||||
|
|
||||||
|
# If boot mode is uefi, then mount the system partition in /boot/efi.
|
||||||
|
# Grub expects the efi system partition to be mounted here.
|
||||||
|
if [ "$IRONIC_BOOT_MODE" = "uefi" ]; then
|
||||||
|
|
||||||
|
# efi system partition is labelled as "efi-part" by Ironic.
|
||||||
|
# lsblk output looks like this:
|
||||||
|
# NAME="sda1" LABEL="efi-part"
|
||||||
|
readonly efi_system_part=$(lsblk -Pio NAME,LABEL $target_disk | \
|
||||||
|
awk -F'"' '/"efi-part"/{print $2}')
|
||||||
|
readonly efi_system_part_dev_file="/dev/$efi_system_part"
|
||||||
|
readonly efi_system_part_mount="$root_part_mount/boot/efi"
|
||||||
|
mkdir -p $efi_system_part_mount
|
||||||
|
mount $efi_system_part_dev_file $efi_system_part_mount
|
||||||
|
fi
|
||||||
|
|
||||||
# TODO(lucasagomes): Add extlinux as a fallback
|
# TODO(lucasagomes): Add extlinux as a fallback
|
||||||
# Find grub version
|
# Find grub version
|
||||||
V=
|
V=
|
||||||
@ -100,6 +116,11 @@ if [ "$IRONIC_BOOT_OPTION" = "local" ]; then
|
|||||||
ret=$?
|
ret=$?
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# If we had mounted efi system partition, umount it.
|
||||||
|
if [ "$IRONIC_BOOT_MODE" = "uefi" ]; then
|
||||||
|
umount $efi_system_part_mount
|
||||||
|
fi
|
||||||
|
|
||||||
umount $root_part_mount/dev
|
umount $root_part_mount/dev
|
||||||
umount $root_part_mount/sys
|
umount $root_part_mount/sys
|
||||||
umount $root_part_mount/proc
|
umount $root_part_mount/proc
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
curl:
|
curl:
|
||||||
tgt:
|
tgt:
|
||||||
parted:
|
parted:
|
||||||
|
util-linux:
|
||||||
|
Loading…
Reference in New Issue
Block a user