From 5dd6c4a8346e87948dee720a559d5bc6f95ad49e Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Tue, 27 Aug 2013 11:00:03 +0100 Subject: [PATCH] Extlinux fallback If GRUB2 is not available in the system a fallback to install Extlinux will happen. This patch also allows you to enforce the use of Extlinux exporting the DIB_EXTLINUX variable. Change-Id: I88fa792a0bd19cacca167134f2054b11c807a451 --- elements/fedora/bin/map-packages | 1 + elements/vm/README.md | 6 +- elements/vm/finalise.d/51-bootloader | 235 +++++++++++++++++---------- 3 files changed, 151 insertions(+), 91 deletions(-) diff --git a/elements/fedora/bin/map-packages b/elements/fedora/bin/map-packages index 551aef29..8f3f3985 100755 --- a/elements/fedora/bin/map-packages +++ b/elements/fedora/bin/map-packages @@ -49,6 +49,7 @@ package_map = { 'openssh-client': 'openssh-clients', 'qpidd': 'qpid-cpp-server', 'qpid-client': 'qpid-cpp-client', + 'extlinux': 'syslinux-extlinux', } for arg in sys.argv[1:]: diff --git a/elements/vm/README.md b/elements/vm/README.md index 5be135b5..0ebb13ae 100644 --- a/elements/vm/README.md +++ b/elements/vm/README.md @@ -1,5 +1,7 @@ Sets up a partitioned disk (rather than building just one filesystem with no partition table). -The disk will have grub[2]-install run on it, and that assumes a functional -grub[2] setup. +By default the disk will have grub[2]-install run on it, in case GRUB2 +is not available in the system a fallback to Extlinux will happen. It's +also possible to enforce the use of Extlinux exporting a DIB_EXTLINUX +varible to the environment. diff --git a/elements/vm/finalise.d/51-bootloader b/elements/vm/finalise.d/51-bootloader index 9e03504f..412ecd1a 100755 --- a/elements/vm/finalise.d/51-bootloader +++ b/elements/vm/finalise.d/51-bootloader @@ -6,101 +6,158 @@ set -e set -x -install-packages grub-pc - -# XXX: grub-probe on the nbd0/loop0 device returns nothing - workaround, manually -# specify modules. https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1073731 -GRUBNAME=`which grub-install` || echo "trying grub2-install" -if [ -z "$GRUBNAME" ]; then - GRUBNAME="bash -x `which grub2-install`" -fi -if [ -z "$GRUBNAME" ]; then - echo "NO grub-install or grub2-install found" - exit 1 -fi # FIXME: [ -n "$IMAGE_BLOCK_DEVICE" ] PART_DEV=$IMAGE_BLOCK_DEVICE -BOOT_DEV=$(echo $IMAGE_BLOCK_DEVICE | sed -e 's/p1//') -GRUB_OPTS=${GRUB_OPTS:""} -# XXX: This is buggy: -# - --target=i386-pc is invalid for non-i386/amd64 architectures -# - and for UEFI too. -# GRUB_OPTS="$GRUB_OPTS --target=i386-pc" -if [[ ! $GRUB_OPTS == *--target* ]]; then - # /sys/ comes from the host machine. If the host machine is using EFI - # but the image being built doesn't have EFI boot-images installed we - # should set the --target to use a BIOS-based boot-image. - # - # * --target tells grub what's the target platform - # * the boot images are placed in /usr/lib/grub/- - # * i386-pc is used for BIOS-based machines - # http://www.gnu.org/software/grub/manual/grub.html#Installation - # - if [ -d /sys/firmware/efi ]; then - if [ ! -d /usr/lib/grub/*-efi ]; then - case $ARCH in - "x86_64"|"amd64") - GRUB_OPTS="$GRUB_OPTS --target=i386-pc" - ;; - "i386") - target=i386-pc - if [ -e /proc/device-tree ]; then - for x in /proc/device-tree/*; do - if [ -e "$x" ]; then - target="i386-ieee1275" - fi - done - fi - GRUB_OPTS="$GRUB_OPTS --target=$target" - ;; - esac +BOOT_DEV=$(echo $IMAGE_BLOCK_DEVICE | sed -e 's#p1##' | sed -e 's#mapper/##') + +function install_extlinux { + install-packages extlinux + + echo "Installing Extlinux..." + + MBR=/usr/share/syslinux/mbr.bin + if [ ! -f $MBR ]; then + MBR=/usr/lib/syslinux/mbr.bin + if [ ! -f $MBR ]; then + echo "mbr.bin (from SYSLINUX) not found." + exit 1 + fi fi - fi -fi -$GRUBNAME --modules="biosdisk part_msdos" $GRUB_OPTS $BOOT_DEV + dd if=$MBR of=$BOOT_DEV -# This might be better factored out into a per-distro 'install-bootblock' -# helper. -if [ -f "/boot/grub/grub.cfg" ] ; then - GRUB_CFG=/boot/grub/grub.cfg -elif [ -f "/boot/grub2/grub.cfg" ] ; then - GRUB_CFG=/boot/grub2/grub.cfg -fi + mkdir -p /boot/syslinux + extlinux --install /boot/syslinux -# If GRUB configuration file does not exist, generate one -if [ ! $GRUB_CFG ]; then - if [ -d /boot/grub2 ]; then - GRUB_CFG=/boot/grub2/grub.cfg - elif [ -d /boot/grub ]; then - GRUB_CFG=/boot/grub/grub.cfg - fi - grub2-mkconfig -o $GRUB_CFG -fi; + if [ -f /etc/redhat-release ]; then + kernel=$(ls -1rv /boot/vmlinuz* | head -1) + initrd=$(ls -1rv /boot/initramfs* | head -1) + elif [ -f /etc/debian_version ]; then + kernel=$(ls -1rv /boot/vmlinuz*generic | head -1) + initrd=$(ls -1rv /boot/initrd*generic | head -1) + else + echo "Unable to find kernel and initram" + exit 1 + fi -DIST=`lsb_release -is` -[ -n "$DIST" ] -RELEASE=`lsb_release -cs` -[ -n "$RELEASE" ] -# grub-mkconfig generates a config with the device in it, -# This shouldn't be needed, but old code has bugs -if [ $RELEASE = 'precise' ] ; then - # Replace the search attempt with a hardcoded root as the Ubuntu reference - # images use. - sed -i "s%search --no.*%%" $GRUB_CFG - sed -i "s%set root=.*%set root=(hd0,1)%" $GRUB_CFG -fi -# force use of a LABEL: -# NOTE: Updating the grub config by hand once deployed should work, its just -# prepping it in a different environment that needs fiddling. -sed -i "s%$PART_DEV%LABEL=cloudimg-rootfs%" $GRUB_CFG -sed -i "s%search --no-floppy --fs-uuid --set=root .*$%search --no-floppy --set=root --label cloudimg-rootfs%" $GRUB_CFG -sed -i "s%root=UUID=[A-Za-z0-9\-]*%root=LABEL=cloudimg-rootfs%" $GRUB_CFG -if [ $DIST = 'Fedora' ] ; then - # enable serial console - sed -i "s%LABEL=cloudimg-rootfs%LABEL=cloudimg-rootfs console=tty0 console=ttyS0,115200%" $GRUB_CFG - if [ $(lsb_release -rs) = '19' ]; then - sed -i "s%UUID=[A-Za-z0-9\-]*%LABEL=cloudimg-rootfs%" /etc/fstab - fi + cat > /boot/syslinux/syslinux.cfg<<_EOF_ +DEFAULT linux + +LABEL linux + KERNEL $kernel + APPEND rw root=LABEL=cloudimg-rootfs + INITRD $initrd +_EOF_ +} + +function install_grub2 { + + install-packages grub-pc + + # XXX: grub-probe on the nbd0/loop0 device returns nothing - workaround, manually + # specify modules. https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1073731 + GRUBNAME=`which grub-install` || echo "trying grub2-install" + if [ -z "$GRUBNAME" ]; then + GRUBNAME="bash -x `which grub2-install`" + fi + + # If no GRUB2 is found, fallback to extlinux + if [ -z "$GRUBNAME" ] || [ $($GRUBNAME --version | grep "0.97" | wc -l) -ne 0 ]; then + echo "No GRUB2 found. Fallback to Extlinux..." + install_extlinux + exit 0 + fi + + echo "Installing GRUB2..." + + GRUB_OPTS=${GRUB_OPTS:""} + # XXX: This is buggy: + # - --target=i386-pc is invalid for non-i386/amd64 architectures + # - and for UEFI too. + # GRUB_OPTS="$GRUB_OPTS --target=i386-pc" + if [[ ! $GRUB_OPTS == *--target* ]]; then + # /sys/ comes from the host machine. If the host machine is using EFI + # but the image being built doesn't have EFI boot-images installed we + # should set the --target to use a BIOS-based boot-image. + # + # * --target tells grub what's the target platform + # * the boot images are placed in /usr/lib/grub/- + # * i386-pc is used for BIOS-based machines + # http://www.gnu.org/software/grub/manual/grub.html#Installation + # + if [ -d /sys/firmware/efi ]; then + if [ ! -d /usr/lib/grub/*-efi ]; then + case $ARCH in + "x86_64"|"amd64") + GRUB_OPTS="$GRUB_OPTS --target=i386-pc" + ;; + "i386") + target=i386-pc + if [ -e /proc/device-tree ]; then + for x in /proc/device-tree/*; do + if [ -e "$x" ]; then + target="i386-ieee1275" + fi + done + fi + GRUB_OPTS="$GRUB_OPTS --target=$target" + ;; + esac + fi + fi + fi + + $GRUBNAME --modules="biosdisk part_msdos" $GRUB_OPTS $BOOT_DEV + + # This might be better factored out into a per-distro 'install-bootblock' + # helper. + if [ -f "/boot/grub/grub.cfg" ] ; then + GRUB_CFG=/boot/grub/grub.cfg + elif [ -f "/boot/grub2/grub.cfg" ] ; then + GRUB_CFG=/boot/grub2/grub.cfg + fi + + # If GRUB configuration file does not exist, generate one + if [ ! $GRUB_CFG ]; then + if [ -d /boot/grub2 ]; then + GRUB_CFG=/boot/grub2/grub.cfg + elif [ -d /boot/grub ]; then + GRUB_CFG=/boot/grub/grub.cfg + fi + grub2-mkconfig -o $GRUB_CFG + fi; + + DIST=`lsb_release -is` + [ -n "$DIST" ] + RELEASE=`lsb_release -cs` + [ -n "$RELEASE" ] + # grub-mkconfig generates a config with the device in it, + # This shouldn't be needed, but old code has bugs + if [ $RELEASE = 'precise' ] ; then + # Replace the search attempt with a hardcoded root as the Ubuntu reference + # images use. + sed -i "s%search --no.*%%" $GRUB_CFG + sed -i "s%set root=.*%set root=(hd0,1)%" $GRUB_CFG + fi + # force use of a LABEL: + # NOTE: Updating the grub config by hand once deployed should work, its just + # prepping it in a different environment that needs fiddling. + sed -i "s%$PART_DEV%LABEL=cloudimg-rootfs%" $GRUB_CFG + sed -i "s%search --no-floppy --fs-uuid --set=root .*$%search --no-floppy --set=root --label cloudimg-rootfs%" $GRUB_CFG + sed -i "s%root=UUID=[A-Za-z0-9\-]*%root=LABEL=cloudimg-rootfs%" $GRUB_CFG + if [ $DIST = 'Fedora' ] ; then + # enable serial console + sed -i "s%LABEL=cloudimg-rootfs%LABEL=cloudimg-rootfs console=tty0 console=ttyS0,115200%" $GRUB_CFG + if [ $(lsb_release -rs) = '19' ]; then + sed -i "s%UUID=[A-Za-z0-9\-]*%LABEL=cloudimg-rootfs%" /etc/fstab + fi + fi +} + +DIB_EXTLINUX=${DIB_EXTLINUX:-0} +if [ "$DIB_EXTLINUX" != "0" ]; then + install_extlinux +else + install_grub2 fi