← Back to branch summary

~soren/vmbuilder/vmbuilder.refactoring

« back to all changes in this revision

Viewing changes to VMBuilder/plugins/ubuntu/hardy.py

  • Committer: Soren Hansen
  • Date: 2009-10-08 10:27:07 UTC
  • mfrom: (344.1.8 vmbuilder.trunk)
  • Revision ID: soren@canonical.com-20091008102707-p6j8m4duiuree7y6
Reconcile split branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
VMBuilder/plugins/ubuntu/hardy.py
38
38
        self.vm.ppa += ['ubuntu-on-ec2/ppa']
39
39
 
40
40
    def install_ec2(self):
41
 
        self.run_in_target('apt-get' ,'--force-yes', '-y', 'install', 'libc6-xen')
42
 
        self.run_in_target('apt-get','--purge','--force-yes', '-y', 'remove', 'libc6-i686')
 
41
 
 
42
        if self.vm.arch == 'i386':
 
43
            self.run_in_target('apt-get' ,'--force-yes', '-y', 'install', 'libc6-xen')
 
44
            self.run_in_target('apt-get','--purge','--force-yes', '-y', 'remove', 'libc6-i686')
 
45
            self.install_from_template('/etc/ld.so.conf.d/libc6-xen.conf', 'xen-ld-so-conf')
43
46
        self.install_from_template('/etc/event.d/xvc0', 'upstart', { 'console' : 'xvc0' })
44
 
        self.install_from_template('/etc/ld.so.conf.d/libc6-xen.conf', 'xen-ld-so-conf')
45
47
        self.run_in_target('update-rc.d', '-f', 'hwclockfirst.sh', 'remove')
46
48
        self.install_from_template('/etc/update-motd.d/51_update-motd', '51_update-motd-hardy')
47
49
        self.run_in_target('chmod', '755', '/etc/update-motd.d/51_update-motd')