From 5abbeac831629b8c02f2c910cc06d5603f75f1fd Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Fri, 23 Dec 2011 01:50:11 +0100 Subject: [PATCH] Fix arch issue for 45-grub-images --- .../fai/config/scripts/GRMLBASE/45-grub-images | 30 ++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images b/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images index 75fc1b2..d6fdb5c 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images +++ b/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images @@ -64,24 +64,28 @@ fi if [ -f "${target}/boot/x86_64-efi.img" ] ; then mv "${target}/boot/x86_64-efi.img" "${target}/${BOOTX64}" fi -if ! [ -r "${target}/${BOOTX64}" ] ; then - echo "Can not access grub efi image." >&2 - exit 1 -fi -SIZE=$(du -sk "${target}/${BOOTX64}" | awk -F" " '{print $1'}) -SIZE=$(((($SIZE / 32 )+2)*32)) +if ifclass AMD64 ; then + if ! [ -r "${target}/${BOOTX64}" ] ; then + echo "Can not access grub efi image." >&2 + exit 1 + fi -dd if=/dev/zero of="${target}/${EFI_IMG}" bs=1k count="$SIZE" 2>/dev/null -$ROOTCMD mkfs.vfat -n GRML "$EFI_IMG" >/dev/null -$ROOTCMD mmd -i "$EFI_IMG" ::EFI -$ROOTCMD mmd -i "$EFI_IMG" ::EFI/BOOT -$ROOTCMD mcopy -i "$EFI_IMG" "$BOOTX64" ::EFI/BOOT/bootx64.efi >/dev/null + SIZE=$(du -sk "${target}/${BOOTX64}" | awk -F" " '{print $1'}) + SIZE=$(((($SIZE / 32 )+2)*32)) + + dd if=/dev/zero of="${target}/${EFI_IMG}" bs=1k count="$SIZE" 2>/dev/null + $ROOTCMD mkfs.vfat -n GRML "$EFI_IMG" >/dev/null + $ROOTCMD mmd -i "$EFI_IMG" ::EFI + $ROOTCMD mmd -i "$EFI_IMG" ::EFI/BOOT + $ROOTCMD mcopy -i "$EFI_IMG" "$BOOTX64" ::EFI/BOOT/bootx64.efi >/dev/null + echo "Generated EFI image $BOOTX64" + echo "Generated bootx64 image $EFI_IMG" +fi rm -f "${target}/${TMP_CONFIG}" +echo "Generated Grub images" -echo "Generated EFI image $BOOTX64" -echo "Generated bootx64 image $EFI_IMG" ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2 -- 2.1.4