Merge "Ensure redhat efi packages are reinstalled during finalise"
This commit is contained in:
commit
d03e7f1327
@ -65,7 +65,8 @@ function install_grub2 {
|
|||||||
"${DIB_BLOCK_DEVICE}" == "gpt" ]]; then
|
"${DIB_BLOCK_DEVICE}" == "gpt" ]]; then
|
||||||
install-packages -m bootloader grub-pc
|
install-packages -m bootloader grub-pc
|
||||||
elif [[ "${DIB_BLOCK_DEVICE}" == "efi" ]]; then
|
elif [[ "${DIB_BLOCK_DEVICE}" == "efi" ]]; then
|
||||||
install-packages -m bootloader grub-efi-$ARCH
|
install-packages -e -m bootloader grub-efi-$ARCH
|
||||||
|
install-packages -m bootloader grub-efi grub-efi-$ARCH
|
||||||
else
|
else
|
||||||
echo "Failure: I'm not sure what bootloader to install"
|
echo "Failure: I'm not sure what bootloader to install"
|
||||||
echo "Ensure you have included a block-device-* element"
|
echo "Ensure you have included a block-device-* element"
|
||||||
|
@ -18,20 +18,21 @@
|
|||||||
"redhat": {
|
"redhat": {
|
||||||
"extlinux": "syslinux-extlinux",
|
"extlinux": "syslinux-extlinux",
|
||||||
"grub-pc": "grub2-tools grub2",
|
"grub-pc": "grub2-tools grub2",
|
||||||
"grub-efi-amd64": "grub2-tools grub2 grub2-pc grub2-efi-x64 grub2-efi-x64-modules efibootmgr shim-x64",
|
"grub-ppc64": "grub2-tools grub2",
|
||||||
"grub-efi-arm64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules efibootmgr shim-aa64",
|
"grub-efi": "grub2-tools grub2 efibootmgr",
|
||||||
"grub-efi-aarch64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules efibootmgr shim-aa64",
|
"grub-efi-amd64": "grub2-efi-x64 grub2-efi-x64-modules shim-x64",
|
||||||
"grub-efi": "grub2-tools grub2-efi efibootmgr",
|
"grub-efi-x86_64": "grub2-efi-x64 grub2-efi-x64-modules shim-x64",
|
||||||
"grub-efi-x86_64": "grub2-tools grub2 grub2-efi-x64 grub2-efi-x64-modules efibootmgr shim-x64",
|
"grub-efi-arm64": "grub2-efi-aa64 grub2-efi-aa64-modules shim-aa64",
|
||||||
"grub-ppc64": "grub2-tools grub2"
|
"grub-efi-aarch64": "grub2-efi-aa64 grub2-efi-aa64-modules shim-aa64"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"default": {
|
"default": {
|
||||||
"dkms_package": "dkms",
|
"dkms_package": "dkms",
|
||||||
"extlinux": "extlinux",
|
"extlinux": "extlinux",
|
||||||
"grub-pc": "grub-pc",
|
"grub-pc": "grub-pc",
|
||||||
"grub-efi-amd64": "grub-efi grub-pc-bin efibootmgr",
|
"grub-efi": "efibootmgr",
|
||||||
"grub-efi-arm64": "grub-efi-arm64 grub-efi-arm64-bin efibootmgr",
|
"grub-efi-amd64": "grub-efi grub-pc-bin",
|
||||||
|
"grub-efi-arm64": "grub-efi-arm64 grub-efi-arm64-bin",
|
||||||
"grub-ppc64": "grub-ieee1275"
|
"grub-ppc64": "grub-ieee1275"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,7 @@ while getopts "hud:em:" opt; do
|
|||||||
DOWNLOAD_PATH=$OPTARG
|
DOWNLOAD_PATH=$OPTARG
|
||||||
;;
|
;;
|
||||||
e)
|
e)
|
||||||
ACTION="erase"
|
ACTION="remove"
|
||||||
;;
|
;;
|
||||||
m)
|
m)
|
||||||
MAP_ELEMENT=$OPTARG
|
MAP_ELEMENT=$OPTARG
|
||||||
|
Loading…
Reference in New Issue
Block a user