[Pkg-escience-soc2009] [SCM] Tool for creating VM images. branch, master, updated. 72c8e53f3bf6d06b31972668eefa7747148aeefd

[root]

The following commit has been merged in the master branch:
commit 1ef5cd1bc20839acd15a28e0ea05d1b09ee97b57
Author: root <root at Lappy-486.A>
Date:   Thu Jun 18 13:06:10 2009 -0400

    Added install_ec2 to debian/etch.py

diff --git a/VMBuilder/plugins/debian/etch.py b/VMBuilder/plugins/debian/etch.py
index 3f61faf..3f67b90 100644
--- a/VMBuilder/plugins/debian/etch.py
+++ b/VMBuilder/plugins/debian/etch.py
@@ -113,6 +113,10 @@ class Etch(suite.Suite):
         logging.debug("Unmounting volatile lrm filesystems")
         self.unmount_volatile()
 
+        if hasattr(self.vm, 'ec2') and self.vm.ec2:
+            logging.debug("Configuring for ec2")
+            self.install_ec2()
+
         logging.debug("Unpreventing daemons from starting")
         self.unprevent_daemons_starting()
 
@@ -340,3 +344,17 @@ class Etch(suite.Suite):
 
     def install_vmbuilder_log(self, logfile, rootdir):
         shutil.copy(logfile, '%s/var/log/vmbuilder-install.log' % (rootdir,))
+
+    def install_ec2(self):
+	#Mostly ported over from the Ubuntu install_ec2 commands
+        self.run_in_target('apt-get' ,'--force-yes', '-y', 'install', 'libc6-xen')
+        self.run_in_target('apt-get','--purge','--force-yes', '-y', 'remove', 'libc6-i686')
+        #TODO: etch doesn't use Upstart, port over to init scripts
+        #Basically, it makes it setup a getty console on xvc0
+        #self.install_from_template('/etc/event.d/xvc0', 'upstart', { 'console' : 'xvc0' })
+        #TODO: Debian bug 420726 may effect this next line since Etch has libc < 2.5-5
+        self.install_from_template('/etc/ld.so.conf.d/libc6-xen.conf', 'xen-ld-so-conf')
+        self.run_in_target('update-rc.d', '-f', 'hwclockfirst.sh', 'remove')
+        #TODO: Change to Debian appropriate MOTD
+        #self.install_from_template('/etc/update-motd.d/51_update-motd', '51_update-motd-hardy')
+        #self.run_in_target('chmod', '755', '/etc/update-motd.d/51_update-motd')

-- 
Tool for creating VM images.