# HG changeset patch # User Alessio Igor Bogani # Date 1315224366 -7200 # Node ID ba04b2ff87309a1d5ff184cc0846de69a499cfb3 # Parent 5a0ca606858b437b7ee3402e7c220e754c2ddb7d Add dev-environment.sh support for virtio targets diff -r 5a0ca606858b -r ba04b2ff8730 sources/root-filesystem/sbin/init.sh --- a/sources/root-filesystem/sbin/init.sh Mon Sep 05 08:49:08 2011 +0200 +++ b/sources/root-filesystem/sbin/init.sh Mon Sep 05 14:06:06 2011 +0200 @@ -36,6 +36,7 @@ [ -b /dev/hdb ] && HOMEDEV=/dev/hdb [ -b /dev/sdb ] && HOMEDEV=/dev/sdb + [ -b /dev/vdb ] && HOMEDEV=/dev/vdb if [ ! -z "$HOMEDEV" ] then mount -o noatime $HOMEDEV /home @@ -48,6 +49,7 @@ [ -b /dev/hdc ] && MNTDEV=/dev/hdc [ -b /dev/sdc ] && MNTDEV=/dev/sdc + [ -b /dev/vdc ] && MNTDEV=/dev/vdc if [ ! -z "$MNTDEV" ] then mount -o ro $MNTDEV /mnt diff -r 5a0ca606858b -r ba04b2ff8730 sources/targets/i686-virtio/settings --- a/sources/targets/i686-virtio/settings Mon Sep 05 08:49:08 2011 +0200 +++ b/sources/targets/i686-virtio/settings Mon Sep 05 14:06:06 2011 +0200 @@ -27,7 +27,9 @@ emulator_command() { + echo "[ ! -z \"\$HDC\" ] && QEMU_EXTRA=\" -drive file=\$HDC,if=virtio,index=2 \$QEMU_EXTRA\"" + echo "[ ! -z \"\$HDB\" ] && QEMU_EXTRA=\" -drive file=\$HDB,if=virtio,index=1 \$QEMU_EXTRA\"" echo -n "qemu -nographic -no-reboot -kernel $KERNEL" - [ "$SYSIMAGE_TYPE" != "initramfs" ] && echo -n " -drive file=$IMAGE,if=virtio" + [ "$SYSIMAGE_TYPE" != "initramfs" ] && echo -n " -drive file=$IMAGE,if=virtio,index=0" echo -n " -append \"$(kernel_cmdline)\" \$QEMU_EXTRA -net nic,model=virtio -net user" } diff -r 5a0ca606858b -r ba04b2ff8730 sources/targets/powerpc-virtio/settings --- a/sources/targets/powerpc-virtio/settings Mon Sep 05 08:49:08 2011 +0200 +++ b/sources/targets/powerpc-virtio/settings Mon Sep 05 14:06:06 2011 +0200 @@ -31,7 +31,9 @@ emulator_command() { + echo "[ ! -z \"\$HDC\" ] && QEMU_EXTRA=\" -drive file=\$HDC,if=virtio,index=2 \$QEMU_EXTRA\"" + echo "[ ! -z \"\$HDB\" ] && QEMU_EXTRA=\" -drive file=\$HDB,if=virtio,index=1 \$QEMU_EXTRA\"" echo -n "qemu-system-ppc -M g3beige -nographic -no-reboot -kernel $KERNEL" - [ "$SYSIMAGE_TYPE" != "initramfs" ] && echo -n " -drive file=$IMAGE,if=virtio" + [ "$SYSIMAGE_TYPE" != "initramfs" ] && echo -n " -drive file=$IMAGE,if=virtio,index=0" echo -n " -append \"$(kernel_cmdline)\" \$QEMU_EXTRA -net nic,model=virtio -net user" }