From dfc31a22bb18221b2c7a7751e655470219ae6489 Mon Sep 17 00:00:00 2001 From: proski Date: Sun, 3 May 2009 19:04:59 +0000 Subject: [PATCH] 2009-05-03 Pavel Roskin * util/i386/pc/grub-mkrescue.in: Allow for the case when efiemu??.o doesn't exist. * util/i386/pc/grub-install.in: Likewise. Use "cp -f" for copying. --- ChangeLog | 7 +++++++ util/i386/pc/grub-install.in | 4 +++- util/i386/pc/grub-mkrescue.in | 9 ++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cf8f8f29..e42bc5684 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-05-03 Pavel Roskin + + * util/i386/pc/grub-mkrescue.in: Allow for the case when + efiemu??.o doesn't exist. + * util/i386/pc/grub-install.in: Likewise. Use "cp -f" for + copying. + 2009-05-03 Bean Vladimir Serbinenko FreeBSD 64-bit support diff --git a/util/i386/pc/grub-install.in b/util/i386/pc/grub-install.in index 31c2dc7fd..e4724f94e 100644 --- a/util/i386/pc/grub-install.in +++ b/util/i386/pc/grub-install.in @@ -221,7 +221,9 @@ for file in ${pkglibdir}/*.mod ${pkglibdir}/*.lst; do done if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then for file in ${pkglibdir}/*.img ${pkglibdir}/efiemu??.o; do - cp -f $file ${grubdir} || exit 1 + if test -f $file; then + cp -f $file ${grubdir} || exit 1 + fi done fi diff --git a/util/i386/pc/grub-mkrescue.in b/util/i386/pc/grub-mkrescue.in index 7d28acd51..da937768b 100644 --- a/util/i386/pc/grub-mkrescue.in +++ b/util/i386/pc/grub-mkrescue.in @@ -116,10 +116,13 @@ fi aux_dir=`mktemp -d` mkdir -p ${aux_dir}/boot/grub -cp ${input_dir}/*.mod ${input_dir}/efiemu??.o \ +for file in ${input_dir}/*.mod ${input_dir}/efiemu??.o \ ${input_dir}/command.lst ${input_dir}/moddep.lst ${input_dir}/fs.lst \ - ${input_dir}/handler.lst ${input_dir}/parttool.lst \ - ${aux_dir}/boot/grub/ + ${input_dir}/handler.lst ${input_dir}/parttool.lst; do + if test -f "$file"; then + cp -f "$file" ${aux_dir}/boot/grub/ + fi +done modules="biosdisk `cat ${input_dir}/partmap.lst` ${modules}" for i in ${modules} ; do