merge with mainline

This commit is contained in:
BVK Chaitanya 2010-05-19 14:39:58 +05:30
commit 868bebea0c
120 changed files with 4083 additions and 13441 deletions

View file

@ -124,7 +124,8 @@ halt
EOF
isofile=`mktemp`
grub-mkrescue --output=${isofile} --override-directory=${builddir} \
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