Mercurial > hg > aboriginal

changeset 1438:ba04b2ff8730

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add dev-environment.sh support for virtio targets
author Alessio Igor Bogani <alessioigorbogani@gmail.com>
date Mon, 05 Sep 2011 14:06:06 +0200
parents 5a0ca606858b
children d2b121fc1567
files sources/root-filesystem/sbin/init.sh sources/targets/i686-virtio/settings sources/targets/powerpc-virtio/settings
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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"
 }
--- 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"
 }