vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge boottest into newreloc

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/util/grub-shell.in
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

2
util/grub-mkrescue.in
View file

@ -165,6 +165,7 @@ if test -e "${coreboot_dir}" ; then
cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
search --fs-uuid --set ${iso_uuid}
set prefix=(\${root})/boot/grub/${target_cpu}-coreboot
source $prefix/grub.cfg
EOF
(for i in ${modules} ; do
echo "insmod $i"
@ -221,6 +222,7 @@ if test -e "${efi64_dir}" ; then
cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
search --fs-uuid --set ${iso_uuid}
set prefix=(\${root})/boot/grub/${target_cpu}-efi
source $prefix/grub.cfg
EOF
tar -C ${memdisk_dir} -cf ${memdisk_img} boot