~ubuntu-virt/vmbuilder/0.11

« back to all changes in this revision

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

  • Committer: Scott Moser
  • Date: 2011-05-04 13:17:23 UTC
  • Revision ID: smoser@ubuntu.com-20110504131723-rwuhazyhnb0atlx2
on oneiric images and later, write to /etc/sudoers.d/uec-ubuntu-user

Show diffs side-by-side

added added

removed removed

Lines of Context:
113
113
        logging.info("Running ec2 postinstall")
114
114
        self.install_from_template('/etc/ec2_version', 'ec2_version', { 'version' : self.vm.ec2_version } )
115
115
        self.install_from_template('/etc/ssh/sshd_config', 'sshd_config')
116
 
        self.install_from_template('/etc/sudoers', 'sudoers')
 
116
 
 
117
        # write /etc/sudoers on <= natty.  Oneiric and >, write to sudoers.d
 
118
        if self.vm.suite <= "natty":
 
119
            self.install_from_template('/etc/sudoers', 'sudoers')
 
120
        else:
 
121
            self.install_from_template('/etc/sudoers.d/uec-ubuntu-user', 'uec-ubuntu-user', mode=440)
117
122
 
118
123
        # LP: #726947 - only write template on dists older than natty
119
124
        lctmpl_suites = ( "dapper", "edgy", "feisty", "gutsy", "hardy",