merge boottest into newreloc

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-04-27 13:46:38 +02:00
commit 083a38ad82
2 changed files with 4 additions and 3 deletions

View file

@ -146,9 +146,8 @@ if [ x$boot = xfd ]; then
bootdev=a
fi
echo ${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev}
#${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev} | tr -d "\r"
#rm -f ${isofile}
${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev} | tr -d "\r"
rm -f ${isofile}
rm -f ${tmpfile} ${cfgfile}
exit 0