[Debian-NP-Commits] r305 - people/vagrant/simple-cdd

[Vagrant Cascadian]

Author: vagrant-guest
Date: Fri Dec  3 16:54:55 2004
New Revision: 305

Modified:
   people/vagrant/simple-cdd/README
   people/vagrant/simple-cdd/qemu-test.conf
Log:
defaults for qemu-test now for non-serial setup, and default memory useage. two
sections in readme for graphical and non-graphical qemu.


Modified: people/vagrant/simple-cdd/README
==============================================================================
--- people/vagrant/simple-cdd/README	(original)
+++ people/vagrant/simple-cdd/README	Fri Dec  3 16:54:55 2004
@@ -159,6 +159,28 @@
 modifying those questions, or you may break simple-cdd.
 
 
+Testing With Qemu
+
+you can test that your image works using qemu...
+
+create a hard drive image:
+
+dd if=/dev/zero of=/path/to/hard_drive.image bs=1024k count=500
+
+the above creates a 500MB image.
+
+edit qemu-test.conf:
+
+hd_img="/path/to/hard_drive.image"
+
+then run:
+
+./qemu-test
+
+this will build the CD image, run qemu to install it, and then run qemu for the
+initial boot into the system.
+
+
 Testing With Qemu in Non-Graphical Mode
 
 i tested this code out entirely with qemu over a slow ssh connection,
@@ -174,32 +196,17 @@
 cat boot-i386 | sed -e 's/TIMEOUT 0/TIMEOUT 5/g' > boot-i386.new && \
   mv -i boot-i386.new boot-i386
 
-
 and make a few changes in CONF.sh:
 
 debian_cd_dir=$simple_cdd_dir/debian-cd
 
 KERNEL_PARAMS="preseed/file=/cdrom/simple-cdd/default.preseed console=ttyS0,38400"
 
+and also edit qemu-test.conf:
 
-create a hard drive image:
-
-dd if=/dev/zero of=/path/to/hard_drive.image bs=1024k count=500
-
-the above creates a 500MB image.
-
-
-edit qemu-test.conf:
+qemu_opts="-nographic -user-net"
 
-hd_img="/path/to/hard_drive.image"
-
-
-then run:
-
-./qemu-test
-
-this will build the CD image, run qemu to install it, and then run qemu for the
-initial boot into the system.
+then follow the steps above for a "regular" qemu setup.
 
 NOTE: since grub doesn't pass the console=ttyS0,38400 by default, it may take a
 while for you to see anything during the initial boot.  be patient, and it will

Modified: people/vagrant/simple-cdd/qemu-test.conf
==============================================================================
--- people/vagrant/simple-cdd/qemu-test.conf	(original)
+++ people/vagrant/simple-cdd/qemu-test.conf	Fri Dec  3 16:54:55 2004
@@ -10,7 +10,10 @@
 cd_img="$OUT/sarge-i386-1.raw"
 
 # memory available within qemu, in MB
-mem=96
+#mem=96
 
 # additional options that get passed to qemu
-qemu_opts="-nographic -user-net"
+# for use with more conventional graphical console
+qemu_opts="-std-vga -user-net"
+# for emulated "serial" console
+#qemu_opts="-nographic -user-net"