Merge lp:~zulcss/vmbuilder/vm--jaunty into lp:vmbuilder/trunk

[Chuck Short]

[Chuck Short (zulcss)]

Please merge this branch, it contains the following:

- Various bug fixes
- Transition to python2.6
- Updated ec2 plugin.

[lp:~zulcss/vmbuilder/vm--jaunty]

322. By Chuck Short on 2009-03-31

Dont install the ec2-api-tools after all

323. By Chuck Short on 2009-03-31

Add apt-key

324. By Chuck Short on 2009-03-31

Add ubuntu-on-ec2 ppa key

325. By Chuck Short on 2009-04-01

Remove appt-key

326. By Chuck Short on 2009-04-06

Update i386 AKI and ARI for hardy

327. By Chuck Short on 2009-04-06

Clean up intrepid

328. By Chuck Short on 2009-04-07

Add landscape-client support for ec2

329. By Chuck Short on 2009-04-07

Update AKI and ARI for hardy again *sigh*

330. By Chuck Short on 2009-04-07

Added warning about out dated AKI and ARI

331. By Chuck Short on 2009-04-20

juanty needs hvc0

332. By Chuck Short on 2009-04-21

Update aki/ari for jaunty

Unmerged revisions

332. By Chuck Short on 2009-04-21

Update aki/ari for jaunty

331. By Chuck Short on 2009-04-20

juanty needs hvc0

330. By Chuck Short on 2009-04-07

Added warning about out dated AKI and ARI

329. By Chuck Short on 2009-04-07

Update AKI and ARI for hardy again *sigh*

328. By Chuck Short on 2009-04-07

Add landscape-client support for ec2

327. By Chuck Short on 2009-04-06

Clean up intrepid

326. By Chuck Short on 2009-04-06

Update i386 AKI and ARI for hardy

325. By Chuck Short on 2009-04-01

Remove appt-key

324. By Chuck Short on 2009-03-31

Add ubuntu-on-ec2 ppa key

323. By Chuck Short on 2009-03-31

Add apt-key

=== modified file 'VMBuilder/plugins/ec2/__init__.py'
--- VMBuilder/plugins/ec2/__init__.py	2008-11-28 11:18:43 +0000
+++ VMBuilder/plugins/ec2/__init__.py	2009-03-30 16:33:41 +0000
@@ -36,6 +36,7 @@
         group.add_option('--ec2-secret-key', metavar='SECRET_ID', help='AWS secret access key.')
         group.add_option('--ec2-kernel','--ec2-aki', metavar='AKI', help='EC2 AKI (kernel) to use.')
         group.add_option('--ec2-ramdisk','--ec2-ari', metavar='ARI', help='EC2 ARI (ramdisk) to use.')
+	group.add_option('--ec2-version',metavar='EC2_VER',help='Specifity the EC2 image version.')
         self.vm.register_setting_group(group)
 
     def preflight_check(self):
@@ -59,17 +60,43 @@
 
         if not self.vm.ec2_kernel:
             logging.debug('No ec2-aki choosen setting to default. Use --ec2-kernel to change this')
-            if self.vm.arch == 'amd64':
-                self.vm.ec2_kernel = 'aki-d314f0ba'
-            else:
-                self.vm.ec2_kernel = 'aki-af14f0c6'
+	    if self.vm.suite == 'hardy':
+               if self.vm.arch == 'amd64':
+	          self.vm.ec2_kernel = 'aki-5012f539'
+	       else:
+	          self.vm.ec2_kernel = 'aki-7e17f017'
+	    elif self.vm.suite == 'intrepid':
+	        if self.vm.arch == 'amd64':
+                   self.vm.ec2_kernel = 'aki-20c12649'
+	        else: 
+	           self.vm.ec2_kernel = 'aki-20c12649' 
+	    elif self.vm.suite == 'jaunty':
+                if self.vm.arch == 'amd64':
+                    self.vm.ec2_kernel = 'aki-6507e00c'
+                else:
+	            self.vm.ec2_kernel = 'aki-6407e00d'
+
+        logging.info('%s - AKI to be used.' %(self.vm.ec2_kernel))
 
         if not self.vm.ec2_ramdisk:
             logging.debug('No ec2-ari choosen setting to default. Use --ec2-ramdisk to change this.')
-            if self.vm.arch == 'amd64':
-                self.vm.ec2_ramdisk = 'ari-d014f0b9'
-            else:
-                self.vm.ec2_ramdisk = 'ari-ac14f0c5'
+	    if self.vm.suite == 'hardy':
+              if self.vm.arch == 'amd64':
+                 self.vm.ec2_ramdisk = 'ari-5512f53c'
+              else:
+                 self.vm.ec2_ramdisk = 'ari-7d17f014'
+	    elif self.vm.suite == 'intrepid':
+                if self.vm.arch == 'amd64':
+                   self.vm.ec2_ramdisk = 'ari-0ac12663' 
+                else:
+                   self.vm.ec2_ramdisk = 'ari-21c12648'
+	    elif self.vm.suite == 'jaunty':
+                if self.vm.arch == 'amd64':
+	           self.vm.ec2_ramdisk = 'ari-6307e00a'
+                else:
+	           self.vm.ec2_ramdisk = 'ari-6207e00b'
+
+	logging .info('%s - ARI to be used.'%(self.vm.ec2_ramdisk))
 
         if not self.vm.ec2_bucket:
             raise VMBuilderUserError('When building for EC2 you must provide an S3 bucket to hold the AMI')
@@ -80,29 +107,28 @@
         if not self.vm.ec2_secret_key:
             raise VMBuilderUserError('When building for EC2 you must provide your AWS secret access key.')
 
-
-        if not self.vm.addpkg:
-             self.vm.addpkg = []
-
-        self.vm.addpkg += ['openssh-server']
-        self.vm.addpkg += ['ec2-init']
-        self.vm.addpkg += ['openssh-server']
-        self.vm.addpkg += ['ec2-modules']
-        self.vm.addpkg += ['server^']
-        self.vm.addpkg += ['standard^']
-
-        if not self.vm.ppa:
-            self.vm.ppa = []
-
-        self.vm.ppa += ['ubuntu-ec2']
+	logging.info('Installing common software')
+	self.install_common()
+	if self.vm.suite == 'hardy':
+             self.install_hardy()
+	elif self.vm.suite == 'intrepid':
+              self.install_intrepid()
+	elif self.vm.suite == 'jaunty':
+              self.install_jaunty()
 
     def post_install(self):
         if not self.vm.ec2:
             return
 
         logging.info("Running ec2 postinstall")
-        self.install_from_template('/etc/event.d/xvc0', 'upstart')
-        self.run_in_target('passwd', '-l', self.vm.user)
+	logging.info("Running common post install")
+	if self.vm.suite == 'hardy':
+	     self.postinstall_hardy()
+	elif self.vm.suite == 'intrepid':
+	     self.postinstall_intrepid()
+	elif self.vm.suite == 'jaunty':
+	     self.postinstall_jaunty()
+	self.postinstall_common()
 
     def deploy(self):
         if not self.vm.ec2:
@@ -121,4 +147,113 @@
 
         return True
 
+    def install_common(self):
+        if not self.vm.ec2:
+            return False
+
+	if not self.vm.addpkg:
+	    self.vm.addpkg = []
+
+	logging.info('Installing common software.')
+	self.vm.addpkg += ['openssh-server', 
+                           'ec2-init', 
+                           'standard^',
+		           'ec2-ami-tools',
+                           'update-motd',
+                           'curl',
+                           'screen',
+                           'screen-profiles']
+
+	if not self.vm.ppa:
+	    self.vm.ppa = []
+
+        self.vm.ppa += ['ubuntu-on-ec2']
+
+    def install_hardy(self):
+	if not self.vm.ec2:
+	    return False
+
+	logging.info('Installing software for hardy.')
+	self.vm.addpkg += ['ruby',
+			   'libc6-xen',
+			   'libopenssl-ruby']
+
+
+    def postinstall_hardy(self):
+	if not self.vm.ec2:
+	    return False
+
+	logging.info('Running post-install for hardy')
+	# work around for libc6/xen bug in hardy.
+	self.install_from_template('/etc/ld.so.conf.d/libc6-xen.conf', 'xen-ld-so-conf')
+	self.run_in_target('apt-get', 'remove', '-y', 'libc6-i686')
+
+	self.install_from_template('/etc/update-motd.d/51_update-motd', '51_update-motd-hardy')
+	self.install_from_template('/etc/event.d/xvc0', 'xvc0')
+	self.run_in_target('update-rc.d', '-f', 'hwclockfirst.sh', 'remove')
+
+    def install_intrepid(self):
+	if not self.vm.ec2:
+	    return False
+
+	logging.info('Installing software for intrepid')
+	self.vm.addpkg += ['ec2-modules',
+			   'ruby',
+			   'libopenssl-ruby',
+                           'server^',
+                           'policykit',
+			   'landscape-client',
+			   'ec2-api-tools']
+
+    def postinstall_intrepid(self):
+	if not self.vm.ec2:
+	    return False
+
+	logging.info('Running post-install for intrepid')
+	self.install_from_template('/etc/update-motd.d/51_update-motd', '51_update-motd-intrepid')
+
+    def install_jaunty(self):
+	if not self.vm.ec2:
+	    return False
+
+	logging.info('Installing software for jaunty')
+	self.vm.addpkg += ['ec2-modules',
+			   'ruby1.8',
+                           'server^',
+			   'libopenssl-ruby1.8']
+
+    def postinall_jaunty(self):
+	if not self.vm.ec2:
+            return False
+	
+	logging.info('Running post-install for jaunty') 
+	self.install_from_template('/etc/update-motd.d/51_update-motd', '51_update-motd-intrepid')
+
+    def postinstall_common(self):
+	if not self.vm.ec2:
+	    return False
+
+	logging.info('Running common post-install')
+	self.install_from_template('/etc/ssh/sshd_config', 'sshd_config')
+	self.run_in_target('chpasswd', '-e', stdin='ubuntu:!\n')
+	# this makes my skin crawl
+	self.install_from_template('/etc/sudoers', 'sudoers')
+	# this doesnt
+	self.run_in_target('chmod', '755', '/etc/update-motd.d/51_update-motd')
+	self.install_from_template('/etc/ec2_version', 'ec2_version', { 'version' : self.vm.ec2_version })
+
+	self.run_in_target('rm', '-f', '/etc/localtime')
+	self.run_in_target('ln', '-s', '/usr/share/zoneinfo/UTC', '/etc/localtime')
+
+	self.run_in_target('usermod', '-u', '135', 'ubuntu')
+	self.run_in_target('chown', '-R', 'ubuntu', '/home/ubuntu')
+
+	self.run_in_target('update-rc.d', '-f', 'hwclock.sh', 'remove') 
+
+	# jdk needs /proc to be mount in order to be installed
+	run_cmd('mount', '-o', 'bind', '/proc', '%s/proc' %self.vm.installdir)
+	self.run_in_target('apt-get', 'install', '-y','--force-yes', 'openjdk-6-jre-headless')
+	self.run_in_target('apt-get', 'install', '-y', '--force-yes', 'ec2-api-tools')
+	run_cmd('umount', '-l', '%s/proc' %self.vm.installdir)
+
 register_plugin(EC2)

=== added file 'VMBuilder/plugins/ec2/templates/51_update-motd-hardy.tmpl'
--- VMBuilder/plugins/ec2/templates/51_update-motd-hardy.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ec2/templates/51_update-motd-hardy.tmpl	2009-03-24 16:33:47 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo "---------------------------------------------------------------------"
+echo "At the moment, only the core of the system is installed. To tune the "
+echo "system to your needs, you can choose to install one or more          "
+echo "predefined collections of software by running the following          "
+echo "command:                                                             "
+echo "                                                                     "
+echo "   sudo tasksel                                                      "
+echo "---------------------------------------------------------------------"

=== added file 'VMBuilder/plugins/ec2/templates/51_update-motd-intrepid.tmpl'
--- VMBuilder/plugins/ec2/templates/51_update-motd-intrepid.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ec2/templates/51_update-motd-intrepid.tmpl	2009-03-24 16:33:47 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo "---------------------------------------------------------------------"
+echo "At the moment, only the core of the system is installed. To tune the "
+echo "system to your needs, you can choose to install one or more          "
+echo "predefined collections of software by running the following          "
+echo "command:                                                             "
+echo "                                                                     "
+echo "   sudo tasksel --section server                                     "
+echo "---------------------------------------------------------------------"

=== added file 'VMBuilder/plugins/ec2/templates/51_update-motd-jaunty.tmpl'
--- VMBuilder/plugins/ec2/templates/51_update-motd-jaunty.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ec2/templates/51_update-motd-jaunty.tmpl	2009-03-24 16:33:47 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo "---------------------------------------------------------------------"
+echo "At the moment, only the core of the system is installed. To tune the "
+echo "system to your needs, you can choose to install one or more          "
+echo "predefined collections of software by running the following          "
+echo "command:                                                             "
+echo "                                                                     "
+echo "   sudo tasksel --section server                                     "
+echo "---------------------------------------------------------------------"

=== added file 'VMBuilder/plugins/ec2/templates/ec2_version.tmpl'
--- VMBuilder/plugins/ec2/templates/ec2_version.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ec2/templates/ec2_version.tmpl	2009-03-24 16:33:47 +0000
@@ -0,0 +1,1 @@
+$version

=== added file 'VMBuilder/plugins/ec2/templates/hvc0.tmpl'
--- VMBuilder/plugins/ec2/templates/hvc0.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ec2/templates/hvc0.tmpl	2009-03-26 17:13:31 +0000
@@ -0,0 +1,16 @@
+# hvc0 - getty
+#
+# This service maintains a getty on tty1 from the point the system is
+# started until it is shut down again.
+
+start on stopped rc2
+start on stopped rc3
+start on stopped rc4
+start on stopped rc5
+
+stop on runlevel 0
+stop on runlevel 1
+stop on runlevel 6
+
+respawn
+exec /sbin/getty 38400 hvc0

=== added file 'VMBuilder/plugins/ec2/templates/sshd_config.tmpl'
--- VMBuilder/plugins/ec2/templates/sshd_config.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ec2/templates/sshd_config.tmpl	2009-03-24 16:33:47 +0000
@@ -0,0 +1,77 @@
+# Package generated configuration file
+# See the sshd(8) manpage for details
+
+# What ports, IPs and protocols we listen for
+Port 22
+# Use these options to restrict which interfaces/protocols sshd will bind to
+#ListenAddress ::
+#ListenAddress 0.0.0.0
+Protocol 2
+# HostKeys for protocol version 2
+HostKey /etc/ssh/ssh_host_rsa_key
+HostKey /etc/ssh/ssh_host_dsa_key
+#Privilege Separation is turned on for security
+UsePrivilegeSeparation yes
+
+# Lifetime and size of ephemeral version 1 server key
+KeyRegenerationInterval 3600
+ServerKeyBits 768
+
+# Logging
+SyslogFacility AUTH
+LogLevel INFO
+
+# Authentication:
+LoginGraceTime 120
+PermitRootLogin yes
+StrictModes yes
+
+RSAAuthentication yes
+PubkeyAuthentication yes
+#AuthorizedKeysFile	%h/.ssh/authorized_keys
+
+# Don't read the user's ~/.rhosts and ~/.shosts files
+IgnoreRhosts yes
+# For this to work you will also need host keys in /etc/ssh_known_hosts
+RhostsRSAAuthentication no
+# similar for protocol version 2
+HostbasedAuthentication no
+# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
+#IgnoreUserKnownHosts yes
+
+# To enable empty passwords, change to yes (NOT RECOMMENDED)
+PermitEmptyPasswords no
+
+# Change to yes to enable challenge-response passwords (beware issues with
+# some PAM modules and threads)
+ChallengeResponseAuthentication no
+
+# Change to no to disable tunnelled clear text passwords
+PasswordAuthentication no
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosGetAFSToken no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+X11Forwarding yes
+X11DisplayOffset 10
+PrintMotd no
+PrintLastLog yes
+TCPKeepAlive yes
+#UseLogin no
+
+#MaxStartups 10:30:60
+#Banner /etc/issue.net
+
+# Allow client to pass locale environment variables
+AcceptEnv LANG LC_*
+
+Subsystem sftp /usr/lib/openssh/sftp-server
+
+UsePAM yes

=== added file 'VMBuilder/plugins/ec2/templates/sudoers.tmpl'
--- VMBuilder/plugins/ec2/templates/sudoers.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ec2/templates/sudoers.tmpl	2009-03-24 16:33:47 +0000
@@ -0,0 +1,23 @@
+# /etc/sudoers
+#
+# This file MUST be edited with the 'visudo' command as root.
+#
+# See the man page for details on how to write a sudoers file.
+#
+
+Defaults	env_reset
+
+# Uncomment to allow members of group sudo to not need a password
+# %sudo ALL=NOPASSWD: ALL
+
+# Host alias specification
+
+# User alias specification
+
+# Cmnd alias specification
+
+# User privilege specification
+root	ALL=(ALL) ALL
+ubuntu  ALL=(ALL) NOPASSWD:ALL
+
+# Members of the admin group may gain root privileges

=== removed file 'VMBuilder/plugins/ec2/templates/upstart.tmpl'
--- VMBuilder/plugins/ec2/templates/upstart.tmpl	2008-11-11 18:28:57 +0000
+++ VMBuilder/plugins/ec2/templates/upstart.tmpl	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# tty1 - getty
-#
-# This service maintains a getty on tty1 from the point the system is
-# started until it is shut down again.
-
-start on stopped rc2
-start on stopped rc3
-start on stopped rc4
-start on stopped rc5
-
-stop on runlevel 0
-stop on runlevel 1
-stop on runlevel 6
-
-respawn
-exec /sbin/getty 38400 xvc0

=== added file 'VMBuilder/plugins/ec2/templates/xen-ld-so-conf.tmpl'
--- VMBuilder/plugins/ec2/templates/xen-ld-so-conf.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ec2/templates/xen-ld-so-conf.tmpl	2009-03-24 16:33:47 +0000
@@ -0,0 +1,1 @@
+hwcap 0 nosegneg

=== added file 'VMBuilder/plugins/ec2/templates/xvc0.tmpl'
--- VMBuilder/plugins/ec2/templates/xvc0.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ec2/templates/xvc0.tmpl	2009-03-26 17:13:31 +0000
@@ -0,0 +1,16 @@
+# xvc0 - getty
+#
+# This service maintains a getty on tty1 from the point the system is
+# started until it is shut down again.
+
+start on stopped rc2
+start on stopped rc3
+start on stopped rc4
+start on stopped rc5
+
+stop on runlevel 0
+stop on runlevel 1
+stop on runlevel 6
+
+respawn
+exec /sbin/getty 38400 xvc0

=== modified file 'VMBuilder/plugins/firstscripts/__init__.py'
--- VMBuilder/plugins/firstscripts/__init__.py	2008-09-30 13:01:58 +0000
+++ VMBuilder/plugins/firstscripts/__init__.py	2009-03-24 13:22:36 +0000
@@ -41,11 +41,17 @@
         
         if self.vm.firstboot:
             logging.debug("Checking if firstboot script %s exists" % (self.vm.firstboot,))
+	    if not(os.access(self.vm.firstboot, os.X_OK)):
+	        raise MBuilderUserError("The first-boot script is not executable")
+
             if not(os.path.isfile(self.vm.firstboot)):
                 raise VMBuilderUserError('The path to the first-boot script is invalid: %s. Make sure you are providing a full path.' % self.vm.firstboot)
                 
         if self.vm.firstlogin:
             logging.debug("Checking if first login script %s exists" % (self.vm.firstlogin,))
+            if not(os.access(self.vm.firstlogin, os.X_OK)):
+                raise VMBuilderUserError("The first-login script is not executable")
+
             if not(os.path.isfile(self.vm.firstlogin)):
                 raise VMBuilderUserError('The path to the first-login script is invalid: %s.  Make sure you are providing a full path.' % self.vm.firstlogin)
 

=== modified file 'VMBuilder/plugins/ubuntu/dapper.py'
--- VMBuilder/plugins/ubuntu/dapper.py	2008-12-16 15:29:50 +0000
+++ VMBuilder/plugins/ubuntu/dapper.py	2009-03-24 13:30:11 +0000
@@ -81,6 +81,9 @@
         logging.debug("Installing ssh keys")
         self.install_authorized_keys()
 
+	logging.debug("Install xen kernel")
+	self.install_xen_kernel()
+
         logging.debug("Installing extra packages")
         self.install_extras()
 

=== modified file 'VMBuilder/plugins/ubuntu/hardy.py'
--- VMBuilder/plugins/ubuntu/hardy.py	2008-11-06 15:36:18 +0000
+++ VMBuilder/plugins/ubuntu/hardy.py	2009-03-24 15:28:46 +0000
@@ -18,13 +18,30 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 import suite
+import logging
+import VMBuilder
+from VMBuilder.util		    import run_cmd
 from VMBuilder.plugins.ubuntu.gutsy import Gutsy
 
 class Hardy(Gutsy):
     virtio_net = True
 
     def xen_kernel_path(self):
-        return '/boot/vmlinuz-2.6.24-19-xen'
+	rcmd = run_cmd('chroot', self.destdir, 'dpkg', '-S', 'xen')
+	temp = rcmd[0].split(": ")
+	xen_kernel = temp[0].split("linux-image-")
+	path = '/boot/vmlinuz-%s' %xen_kernel
+	return path
 
     def xen_ramdisk_path(self):
-        return '/boot/initrd.img-2.6.24-19-xen'
+	rcmd = run_cmd('chroot', self.destdir, 'dpkg', '-S', 'xen')
+	temp = rcmd[0].split(": ")
+	xen_ramdisk = temp[0].split("linux-image-")
+	path = '/boot/initrd.img-%s' %xen_ramdisk
+	return path
+
+    def install_xen_kernel(self):
+	import VMBuilder.plugins.xen
+
+        if isinstance(self.vm.hypervisor, VMBuilder.plugins.xen.Xen):
+	    self.run_in_target('apt-get', '-y', '--force-yes', 'install', 'linux-image-xen')

=== modified file 'VMBuilder/plugins/ubuntu/intrepid.py'
--- VMBuilder/plugins/ubuntu/intrepid.py	2009-02-17 14:39:16 +0000
+++ VMBuilder/plugins/ubuntu/intrepid.py	2009-03-24 15:28:46 +0000
@@ -35,3 +35,8 @@
         run_cmd('sed', '-ie', 's/^# kopt=root=\([^ ]*\)\(.*\)/# kopt=root=UUID=%s\\2/g' % bootdev.fs.uuid, '%s/boot/grub/menu.lst' % self.destdir)
         run_cmd('sed', '-ie', 's/^# groot.*/# groot=%s/g' % bootdev.fs.uuid, '%s/boot/grub/menu.lst' % self.destdir)
         run_cmd('sed', '-ie', '/^# kopt_2_6/ d', '%s/boot/grub/menu.lst' % self.destdir)
+    def install_xen_kernel(self):
+	import VMBuilder.plugins.xen
+
+	if isinstance(self.vm.hypervisor, VMBuilder.plugins.xen.Xen):
+	   logging.info('Skipping Xen kernel installation.')

=== modified file 'VMBuilder/plugins/ubuntu/jaunty.py'
--- VMBuilder/plugins/ubuntu/jaunty.py	2008-12-04 16:27:22 +0000
+++ VMBuilder/plugins/ubuntu/jaunty.py	2009-03-24 15:28:46 +0000
@@ -31,3 +31,9 @@
         run_cmd('sed', '-ie', 's/^# kopt=root=\([^ ]*\)\(.*\)/# kopt=root=UUID=%s\\2/g' % bootdev.fs.uuid, '%s/boot/grub/menu.lst' % self.destdir)
         run_cmd('sed', '-ie', 's/^# groot.*/# groot=%s/g' % bootdev.fs.uuid, '%s/boot/grub/menu.lst' % self.destdir)
         run_cmd('sed', '-ie', '/^# kopt_2_6/ d', '%s/boot/grub/menu.lst' % self.destdir)
+
+    def install_xen_kernel(self):
+	import VMBuilder.plugins.xen
+
+  	if isinstance(self.vm.hypervisor, VMBuilder.plugins.xen.Xen):
+	    logging.info('Skipping Xen kernel installation.')

=== modified file 'VMBuilder/plugins/ubuntu/templates/sources.list.tmpl'
--- VMBuilder/plugins/ubuntu/templates/sources.list.tmpl	2008-11-28 09:59:59 +0000
+++ VMBuilder/plugins/ubuntu/templates/sources.list.tmpl	2009-03-24 13:15:03 +0000
@@ -9,7 +9,7 @@
 
 #if $ppa
 #for $p in $ppa
-deb http://ppa.launchpad.net/$p/ubuntu $suite #slurp
+deb http://ppa.launchpad.net/$p/ppa/ubuntu $suite #slurp
 #echo ' '.join($components)
 
 #end for

=== modified file 'debian/control'
--- debian/control	2008-12-16 13:39:21 +0000
+++ debian/control	2009-03-24 13:17:11 +0000
@@ -9,7 +9,7 @@
 
 Package: python-vm-builder
 Architecture: all
-Depends: kvm (>= 1:69) | qemu, debootstrap (>= 1.0.9), parted, kpartx, ubuntu-keyring, ${python:Depends}, python-cheetah, devscripts
+Depends: kvm (>= 1:69) | qemu, debootstrap (>= 1.0.9), parted, kpartx, ubuntu-keyring, ${python:Depends}, python-cheetah, devscripts, rsync
 Recommends: python-libvirt
 XB-Python-Version: ${python:Versions}
 Description: VM builder

=== modified file 'debian/python-vm-builder-ec2.install'
--- debian/python-vm-builder-ec2.install	2008-10-20 22:09:39 +0000
+++ debian/python-vm-builder-ec2.install	2009-03-24 14:03:02 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/python2.5/site-packages/VMBuilder/plugins/ec2
+debian/tmp/usr/lib/python*/*-packages/VMBuilder/plugins/ec2

=== modified file 'debian/python-vm-builder.install'
--- debian/python-vm-builder.install	2008-10-21 08:14:00 +0000
+++ debian/python-vm-builder.install	2009-03-24 14:15:32 +0000
@@ -1,12 +1,12 @@
 debian/tmp/etc
 debian/tmp/usr/bin/vmbuilder
-debian/tmp/usr/lib/python2.5/site-packages/VMBuilder/*.py
-debian/tmp/usr/lib/python2.5/site-packages/VMBuilder/plugins/*.py
-debian/tmp/usr/lib/python2.5/site-packages/VMBuilder/plugins/cli
-debian/tmp/usr/lib/python2.5/site-packages/VMBuilder/plugins/firstscripts
-debian/tmp/usr/lib/python2.5/site-packages/VMBuilder/plugins/kvm
-debian/tmp/usr/lib/python2.5/site-packages/VMBuilder/plugins/libvirt
-debian/tmp/usr/lib/python2.5/site-packages/VMBuilder/plugins/postinst
-debian/tmp/usr/lib/python2.5/site-packages/VMBuilder/plugins/ubuntu
-debian/tmp/usr/lib/python2.5/site-packages/VMBuilder/plugins/xen
-debian/tmp/usr/lib/python2.5/site-packages/VMBuilder/plugins/vmware
+debian/tmp/usr/lib/python*/*-packages/VMBuilder/*.py
+debian/tmp/usr/lib/python*/*-packages/VMBuilder/plugins/*.py
+debian/tmp/usr/lib/python*/*-packages/VMBuilder/plugins/cli
+debian/tmp/usr/lib/python*/*-packages/VMBuilder/plugins/firstscripts
+debian/tmp/usr/lib/python*/*-packages/VMBuilder/plugins/kvm
+debian/tmp/usr/lib/python*/*-packages/VMBuilder/plugins/libvirt
+debian/tmp/usr/lib/python*/*-packages/VMBuilder/plugins/postinst
+debian/tmp/usr/lib/python*/*-packages/VMBuilder/plugins/ubuntu
+debian/tmp/usr/lib/python*/*-packages/VMBuilder/plugins/xen
+debian/tmp/usr/lib/python*/*-packages/VMBuilder/plugins/vmware