[gnome-ostree-integration] install-boot: Handle mbr.bin in /usr/share



commit 4714897ca70cf73223e36f111cd56d060b11909d
Author: Alexander Larsson <alexl redhat com>
Date:   Mon Sep 22 12:32:48 2014 +0200

    install-boot: Handle mbr.bin in /usr/share
    
    Later versions of openembedded puts mbr.bin in
    /usr/share/syslinux/mbr.bin

 src/installboot/gnome-ostree-install-boot |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/installboot/gnome-ostree-install-boot b/src/installboot/gnome-ostree-install-boot
index 8984ded..1297b02 100644
--- a/src/installboot/gnome-ostree-install-boot
+++ b/src/installboot/gnome-ostree-install-boot
@@ -24,6 +24,11 @@ export PARTITION=`echo ${BOOT_PARTITION} | sed -rn "s,(.+)([0-9]),\2,p"`
 
 if test -z "${DEVICE}"; then echo "Failed to determine device"; exit 1; fi
 
-dd if=/usr/lib/syslinux/mbr.bin of=${DEVICE}
+export MBR="/usr/lib/syslinux/mbr.bin"
+# Some later versions put it in $datapkgdir
+if test -f "/usr/share/syslinux/mbr.bin"; then
+    MBR="/usr/share/syslinux/mbr.bin";
+fi
+dd if=${MBR} of=${DEVICE}
 /usr/sbin/extlinux --install /boot/
 systemctl --force poweroff


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]