← Back to branch summary

~zulcss/vmbuilder/vmbuilder-jaunty-ec2

« back to all changes in this revision

Viewing changes to VMBuilder/plugins/ec2/__init__.py

  • Committer: Chuck Short
  • Date: 2009-03-30 16:33:41 UTC
  • Revision ID: zulcss@ubuntu.com-20090330163341-ycsay4i1ysu2d40a
Move jdk install stuff to postinstall_common

Show diffs side-by-side

added added

removed removed

Lines of Context:
VMBuilder/plugins/ec2/__init__.py
169
169
 
170
170
        self.vm.ppa += ['ubuntu-on-ec2']
171
171
 
172
 
        #java needs /proc to be mounted in order to be installed.
173
 
        run_cmd('mount', '-o', 'bind', '/proc', '%s/proc' % self.vm.installdir)
174
 
        self.run_in_target('apt-get', 'install', '-y','--force-yes', 'openjdk-6-jre-headless')
175
 
        self.run_in_target('apt-get', 'install', '-y', '--force-yes', 'ec2-api-tools')
176
 
        run_cmd('umount', '-l', '%s/proc' %self.vm.installdir)
177
 
 
178
172
    def install_hardy(self):
179
173
        if not self.vm.ec2:
180
174
            return False
256
250
 
257
251
        self.run_in_target('update-rc.d', '-f', 'hwclock.sh', 'remove') 
258
252
 
 
253
        # jdk needs /proc to be mount in order to be installed
 
254
        run_cmd('mount', '-o', 'bind', '/proc', '%s/proc' %self.vm.installdir)
 
255
        self.run_in_target('apt-get', 'install', '-y','--force-yes', 'openjdk-6-jre-headless')
 
256
        self.run_in_target('apt-get', 'install', '-y', '--force-yes', 'ec2-api-tools')
 
257
        run_cmd('umount', '-l', '%s/proc' %self.vm.installdir)
 
258
 
259
259
register_plugin(EC2)