From f9709968ac068f7c394bd3c85ed1d2d16ccf8409 Mon Sep 17 00:00:00 2001 From: Andreas Loibl Date: Thu, 9 Feb 2012 04:22:58 +0100 Subject: only include efi-stuff into binary if bootloader is grub2 --- auto/build | 2 ++ config/binary_local-hooks/grub2-efi | 8 ++++++++ config/binary_local-hooks/grub2-theme | 8 ++++++++ config/binary_local-hooks/mkefipart-fat | 9 +++++++++ 4 files changed, 27 insertions(+) diff --git a/auto/build b/auto/build index 66d51cc..b414473 100755 --- a/auto/build +++ b/auto/build @@ -1,11 +1,13 @@ #!/bin/bash +. config/binary . config/bootstrap . config/common . config/kanotix bit=32 LABEL=Kanotix [ "$LB_ARCHITECTURE" = "amd64" ] && bit=64 && LABEL=${LABEL}64 +export LB_BOOTLOADER # Update kanotix-version (32/64-bit and timestamp) mkdir -p config/chroot_local-includes/etc diff --git a/config/binary_local-hooks/grub2-efi b/config/binary_local-hooks/grub2-efi index f786f3c..cd922e1 100755 --- a/config/binary_local-hooks/grub2-efi +++ b/config/binary_local-hooks/grub2-efi @@ -1,5 +1,13 @@ #!/bin/bash +case "$LB_BOOTLOADER" in +grub2|burg) + ;; +*) + exit 0 + ;; +esac + platform=x86_64-efi efi_name=x64 modules="search iso9660 configfile normal memdisk tar part_msdos fat" diff --git a/config/binary_local-hooks/grub2-theme b/config/binary_local-hooks/grub2-theme index 8fd752a..36464ee 100755 --- a/config/binary_local-hooks/grub2-theme +++ b/config/binary_local-hooks/grub2-theme @@ -1,5 +1,13 @@ #!/bin/bash # copy theme related files to binary +case "$LB_BOOTLOADER" in +grub2|burg) + ;; +*) + exit 0 + ;; +esac + mkdir -p binary/boot/grub cp chroot/usr/share/grub/unicode.pf2 binary/boot/grub/ cp chroot/usr/share/images/grub/kanotix-logo.png binary/boot/grub/ diff --git a/config/binary_local-hooks/mkefipart-fat b/config/binary_local-hooks/mkefipart-fat index 5273076..90dd64c 100755 --- a/config/binary_local-hooks/mkefipart-fat +++ b/config/binary_local-hooks/mkefipart-fat @@ -3,6 +3,15 @@ # # Generate an image for a FAT-EFI-partition +case "$LB_BOOTLOADER" in +grub2|burg) + ;; +*) + exit 0 + ;; +esac + + if [ ! -x /usr/bin/mmd ]; then echo "Error: mtools are needed! Run: apt-get install mtools" exit 1 -- cgit v1.0