Fill out bootloader pkg-map
Our bootloader install fails on non-gentoo builds due to missing pkg-map for grub-pc. This map should really live in the bootloader element, so move it there and fill it out. Change-Id: Ib11b9df84b593ab25232729a570c812f1b4b8774
This commit is contained in:
parent
d5da803ff8
commit
cd9fdf05e9
@ -5,11 +5,6 @@
|
||||
},
|
||||
"suse": {
|
||||
"dkms_package": ""
|
||||
},
|
||||
"gentoo": {
|
||||
"dkms_package": "",
|
||||
"grub-pc": "grub",
|
||||
"extlinux": "syslinux"
|
||||
}
|
||||
},
|
||||
"default": {
|
||||
|
@ -19,7 +19,7 @@ else
|
||||
fi
|
||||
|
||||
function install_extlinux {
|
||||
install-packages -m base extlinux
|
||||
install-packages -m bootloader extlinux
|
||||
|
||||
echo "Installing Extlinux..."
|
||||
|
||||
@ -59,9 +59,9 @@ function install_grub2 {
|
||||
if [ -f "/tmp/grub/install" ] ; then
|
||||
source /tmp/grub/install
|
||||
elif [[ "$ARCH" =~ "ppc" ]]; then
|
||||
install-packages -m base grub-ieee1275
|
||||
install-packages -m bootloader grub-ieee1275
|
||||
else
|
||||
install-packages -m base grub-pc
|
||||
install-packages -m bootloader grub-pc
|
||||
fi
|
||||
|
||||
# XXX: grub-probe on the nbd0/loop0 device returns nothing - workaround, manually
|
||||
|
17
elements/bootloader/pkg-map
Normal file
17
elements/bootloader/pkg-map
Normal file
@ -0,0 +1,17 @@
|
||||
{
|
||||
"family": {
|
||||
"gentoo": {
|
||||
"dkms_package": "",
|
||||
"extlinux": "syslinux",
|
||||
"grub-pc": "grub"
|
||||
},
|
||||
"suse": {
|
||||
"dkms_package": ""
|
||||
}
|
||||
},
|
||||
"default": {
|
||||
"dkms_package": "dkms",
|
||||
"extlinux": "extlinux",
|
||||
"grub-pc": "grub-pc"
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user