merge with mainline

This commit is contained in:
BVK Chaitanya 2010-08-26 12:11:57 +05:30
commit 8fdefb9253
571 changed files with 9244 additions and 5950 deletions

View file

@ -124,10 +124,10 @@ halt
EOF
isofile=`mktemp`
grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage --output=${isofile} \
--override-directory=${builddir} \
/boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
>/dev/null 2>&1
sh @builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage \
--override-directory=${builddir}/grub-core --output=${isofile} \
boot/grub/grub.cfg=${cfgfile} \
/boot/grub/testcase.cfg=${source} >/dev/null 2>&1
hdafile=`mktemp`
cp ${isofile} ${hdafile}