[2169] 2009-05-03 Pavel Roskin <address@hidden>

[Pavel Roskin]

Revision: 2169
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2169
Author:   proski
Date:     2009-05-03 19:04:59 +0000 (Sun, 03 May 2009)
Log Message:
-----------
2009-05-03  Pavel Roskin  <address@hidden>

        * 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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/i386/pc/grub-install.in
    trunk/grub2/util/i386/pc/grub-mkrescue.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-05-03 10:14:19 UTC (rev 2168)
+++ trunk/grub2/ChangeLog       2009-05-03 19:04:59 UTC (rev 2169)
@@ -1,3 +1,10 @@
+2009-05-03  Pavel Roskin  <address@hidden>
+
+       * 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  <address@hidden> Vladimir Serbinenko <address@hidden>
 
        FreeBSD 64-bit support

Modified: trunk/grub2/util/i386/pc/grub-install.in
===================================================================
--- trunk/grub2/util/i386/pc/grub-install.in    2009-05-03 10:14:19 UTC (rev 
2168)
+++ trunk/grub2/util/i386/pc/grub-install.in    2009-05-03 19:04:59 UTC (rev 
2169)
@@ -221,7 +221,9 @@
 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
 

Modified: trunk/grub2/util/i386/pc/grub-mkrescue.in
===================================================================
--- trunk/grub2/util/i386/pc/grub-mkrescue.in   2009-05-03 10:14:19 UTC (rev 
2168)
+++ trunk/grub2/util/i386/pc/grub-mkrescue.in   2009-05-03 19:04:59 UTC (rev 
2169)
@@ -116,10 +116,13 @@
 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