Merge lp:~marceloshima/testdrive/grub into lp:testdrive

[Marcelo Boveto Shima]

This branch adds the option --grub.
This option uses /var/cache/testdrive as cache dir
and ignores the virtual machine stuff.

Once the iso had been downloaded it invokes update-grub.

The script 50_testdrive should be placed at /etc/grub.d/
When update-grub is invoke it looks for iso files at
/var/cache/testdrive/iso and creates a boot menu for
booting directly into the iso.

[Dustin Kirkland  (kirkland)]

This is a neat idea :-) We need to make sure, though, that it's well documented that this invocation of TestDrive would affect your real system and not a virtual machine.

Andres will need to review this merge proposal, since he has drastically changed TestDrive for the GTK bits.

[Andres Rodriguez (andreserl)]

HI Marcelo,

This is indeed a nice idea. Sorry for not reviewing it earlier but I've been busy with the GTK.

Anyways, would you please update your branch with the trunk to see if the latest changes of testdrive have affected yours. Once that done, please resubmit for review.

Thank you.

review: Needs Resubmitting

[Jackson Doak (noskcaj)]

i hope we can get this working now, it's a good idea

Unmerged revisions

243. By Marcelo Boveto Shima <mshima@note1> on 2010-06-01

Add grub support to testdrive

=== added file '50_testdrive'
--- 50_testdrive	1970-01-01 00:00:00 +0000
+++ 50_testdrive	2010-06-01 04:14:22 +0000
@@ -0,0 +1,71 @@
+#!/bin/bash -e
+# Created by Robert Wall, 2010-03-07
+# Modified by Marcelo Boveto Shima, 2010-03-07
+
+#DEBUG=0
+# Path to USB stick's current mountpoint
+#boot_disk_mountpoint="`pwd`"
+# path to location of ISOs
+isolocation="/var/cache/testdrive/iso"
+
+# Others options at /usr/share/initramfs-tools/scripts/casper-bottom/ at casper/filesystem.squashfs
+
+OPTIONS="noeject noprompt quiet splash"
+if [ ! -d "${boot_disk_mountpoint}${isolocation}" ]
+then
+	exit 0
+fi
+
+if [ -n "$boot_disk_mountpoint" ]
+then
+	exec > "${boot_disk_mountpoint}/boot/grub/grub.cfg"
+fi
+
+for isofile in ${boot_disk_mountpoint}${isolocation}/*.iso
+do
+	[ x$DEBUG == "x1" ] && echo "Trying $isofile" >&2
+	relative_isofile=${isolocation}/`basename $isofile`
+	TITLE=`isoinfo -R -x "/.disk/info" -i $isofile | sed "s/\"/'/g"`
+	if [ -z "$TITLE" ]
+	then
+		TITLE=`isoinfo -R -d -i $isofile | grep -e "Volume id" | cut -d":" -f2 | sed "s/^ //"`
+	fi
+	if [ -z "$TITLE" ]
+	then
+		TITLE=`isoinfo -R -x "/README.diskdefines" -i $isofile | grep DISKNAME | cut -d' ' -f4- | sed "s/\"/'/g"`
+	fi
+	if [ -z "$TITLE" ]
+	then
+		TITLE=`basename $isofile .iso`
+	fi
+	TITLE="Testdrive: $TITLE"
+	[ x$DEBUG == "x1" ] && echo "Title $TITLE" >&2
+
+	INSTALLER_LANG=`cat /etc/default/locale | grep "LANG=" | cut -d"\"" -f2 | cut -d"." -f1`
+	if [ -n "$INSTALLER_LANG" ]
+        then
+                INSTALLER_LANG="debian-installer/language=$INSTALLER_LANG"
+        fi
+	[ x$DEBUG == "x1" ] && echo "Lang $INSTALLER_LANG" >&2
+
+	INITRD=`isoinfo -R -f -i $isofile | grep initrd | grep -e "\.gz$" -e "\.lz$" -e "\.img" | tail -n1`
+	[ x$DEBUG == "x1" ] && echo "Initrd $INITRD" >&2
+	VMLINUZ=`isoinfo -R -f -i $isofile | grep "vmlinuz" | tail -n1`
+	[ x$DEBUG == "x1" ] && echo "Vmlinuz $VMLINUZ" >&2
+
+	if [ -z "$INITRD" -o -z "$VMLINUZ" ]
+	then
+		echo "File not found skipping" >&2
+		exit 0
+	fi
+
+	echo "Found $TITLE on $isofile" >&2
+	cat <<EOF
+menuentry "$TITLE" {
+	loopback loop $relative_isofile
+	linux (loop)$VMLINUZ boot=casper iso-scan/filename=$relative_isofile $OPTIONS $INSTALLER_LANG --
+	initrd (loop)$INITRD
+}
+EOF
+done
+
 
=== modified file 'testdrive'
--- testdrive	2010-05-20 22:48:26 +0000
+++ testdrive	2010-06-01 04:14:22 +0000
@@ -136,6 +136,8 @@
 		help='try to launch usb-creator for further testing')
 	parser.add_option('-r', '--release', action='store', type='string', dest='release',
 		help='hardcode Ubuntu RELEASE codename')
+	parser.add_option('-g', '--grub', action='store_true', dest='grub', default=False,
+		help='put the iso into a system directory for grub')
 
 	(opt, args) = parser.parse_args()
 	info("version passed: %s" % opt.version)
@@ -191,26 +193,35 @@
 		hasOptions = True
 		td.r = opt.release
 
-	# Choose the virtualization engine
-	if not td.VIRT:
-		td.VIRT = td.get_virt()
-	#NOTICE: Removed from get_virt() and placed here
-	if td.VIRT == 1:
-		error("Your CPU supports KVM acceleration; please install KVM:\n\
-			sudo apt-get install qemu-kvm")
-	if td.VIRT == 0:
-		error("Your CPU does not support acceleration; run kvm-ok for more information; then please install VirtualBox:\n\
-			kvm-ok\n\
-			sudo apt-get install virtualbox-ose")
-	if td.VIRT == "kvm":
-		info("Using KVM for virtual machine hosting...");
-		virt = kvm.KVM(td)
-	if td.VIRT == "virtualbox":
-		info("Using VirtualBox for virtual machine hosting...")
-		virt = virtualbox.VBox(td)
-	if td.VIRT == "paralels":
-		info("Using Parallels Desktop for virtual machine hosting...")
-		virt = parallels.Parallels(td)
+	if opt.grub:
+		grub_script = "/etc/grub.d/50_testdrive"
+		info("Looking for %s" % grub_script)
+		if not os.path.exists(grub_script):
+			error("Grub script not installed.")
+		td.CACHE = "/var/cache/testdrive"
+		td.CACHE_ISO = "/var/cache/testdrive/iso"
+		td.GRUB = True
+	else:
+		# Choose the virtualization engine
+		if not td.VIRT:
+			td.VIRT = td.get_virt()
+		#NOTICE: Removed from get_virt() and placed here
+		if td.VIRT == 1:
+			error("Your CPU supports KVM acceleration; please install KVM:\n\
+				sudo apt-get install qemu-kvm")
+		if td.VIRT == 0:
+			error("Your CPU does not support acceleration; run kvm-ok for more information; then please install VirtualBox:\n\
+				kvm-ok\n\
+				sudo apt-get install virtualbox-ose")
+		if td.VIRT == "kvm":
+			info("Using KVM for virtual machine hosting...");
+			virt = kvm.KVM(td)
+		if td.VIRT == "virtualbox":
+			info("Using VirtualBox for virtual machine hosting...")
+			virt = virtualbox.VBox(td)
+		if td.VIRT == "paralels":
+			info("Using Parallels Desktop for virtual machine hosting...")
+			virt = parallels.Parallels(td)
 
 	# set defaults were undefined
 	td.set_defaults()
@@ -269,6 +280,9 @@
 	if cmd != 0:
 		run_or_die(cmd)
 
+	if opt.grub:
+		run_or_die("update-grub")
+		sys.exit(0)
 	# Launch the VM
 	info("Validating Virtualization Method....")
 	try:
 
=== modified file 'testdrive.py'
--- testdrive.py	2010-05-28 19:38:15 +0000
+++ testdrive.py	2010-06-01 04:14:22 +0000
@@ -42,6 +42,7 @@
 		self.r = None
 		self.PROTO = None
 		self.m = None
+		self.GRUB = False
 
 	def set_values(self, var, value):
 		if var == 'kvm_args':
@@ -70,6 +71,8 @@
 			self.u = value
 		if var == 'm':
 			self.m = [value]
+		if var == 'grub':
+			self.GRUB = [value]
 
 	def load_config_file(self, config_file):
 		cfg = ConfigParser.ConfigParser()
@@ -128,11 +131,11 @@
 
 		if self.CACHE_IMG is None:
 			self.CACHE_IMG = '%s/img' % self.CACHE
-		if not os.path.exists(self.CACHE_IMG):
+		if not self.GRUB and not os.path.exists(self.CACHE_IMG):
 			os.makedirs(self.CACHE_IMG, 0700)
 		# if running the image from /dev/shm, remove the image when done
 		# (unless CLEAN_IMG is set)
-		if self.CLEAN_IMG is None:
+		if not self.GRUB and self.CLEAN_IMG is None:
 			if self.CACHE_IMG == '/dev/shm':
 				self.CLEAN_IMG = True
 			else:
@@ -141,7 +144,12 @@
 		if self.CACHE_ISO is None:
 			self.CACHE_ISO = '%s/iso' % self.CACHE
 		if not os.path.exists(self.CACHE_ISO):
-			os.makedirs(self.CACHE_ISO, 0700)
+			if not self.GRUB: 
+				os.makedirs(self.CACHE_ISO, 0700)
+			else:
+				os.makedirs(self.CACHE_ISO, 0755)
+		if self.GRUB: 
+			return
 
 		if len(self.SMP) == 0:
 			self.SMP = commands.getoutput("grep -c ^processor /proc/cpuinfo")