bootable/newinstaller
| Revision | b78afc4440637938e829238b928d3fff067465ba (tree) |
|---|---|
| Time | 2019-03-19 17:33:13 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
install/grub2/efi/boot/android.cfg (diff) rpm/qemu-android (diff)| @@ -5,9 +5,7 @@ function add_boot_entry { | ||
| 5 | 5 | menuentry "$2" "$@" --class android-x86 { |
| 6 | 6 | savedefault |
| 7 | 7 | set root=$android |
| 8 | - if [ -e $2/kernel ]; then | |
| 9 | - true | |
| 10 | - else | |
| 8 | + if [ ! -e $2/kernel ]; then | |
| 11 | 9 | search --no-floppy --set root -f $2/kernel |
| 12 | 10 | fi |
| 13 | 11 | set kd=$2 |
| @@ -46,7 +46,8 @@ run_qemu_on_port() | ||
| 46 | 46 | -append "CMDLINE console=ttyS0 RAMDISK=vdb $DATADEV" \ |
| 47 | 47 | -initrd initrd.img \ |
| 48 | 48 | -m 2048 -smp 2 -cpu host \ |
| 49 | - -usbdevice tablet -machine vmport=off \ | |
| 49 | + -usb -device usb-tablet,bus=usb-bus.0 \ | |
| 50 | + -machine vmport=off \ | |
| 50 | 51 | -soundhw ac97 \ |
| 51 | 52 | -serial mon:stdio \ |
| 52 | 53 | -boot menu=on \ |
Fork