← Back to branch summary

~fginther/vmbuilder/jenkins_kvm-add-git-for-maas

« back to all changes in this revision

Viewing changes to templates/img-juju.tmpl

  • Committer: Ben Howard
  • Date: 2014-02-28 17:37:09 UTC
  • Revision ID: ben.howard@canonical.com-20140228173709-i0h1fxkxoi7wmbhb
Use libnss-myhostname for Vagrant images, rather than mucking with /etc/hosts.
      Gate architectures for MAAS 14.04 images.

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/img-juju.tmpl
224
224
LABEL=juju-lxcfs        /var/lib/lxc    btrfs   defaults,subvol=@lxc,autodefrag,discard,compress=lzo 0 0
225
225
EOF
226
226
 
227
 
# Give the host a hostname
228
 
echo "vagrant-ubuntu-${suite}-${arch}" > ${mp}/etc/hostname
229
 
echo "127.0.1.1 vagrant-ubuntu-${suite}-${arch}" >> ${mp}/etc/hosts
230
 
 
231
227
# Setup the vagrant user
232
228
xchroot useradd -m vagrant -s /bin/bash
233
229
echo "root:vagrant" | chroot ${mp} chpasswd
272
268
 
273
269
EOF
274
270
 
275
 
# Add the PPP module
276
 
cat <<EOF >> "${mp}/etc/modules"
277
 
ppp_mppe
278
 
EOF
 
271
# Give the host a hostname
 
272
echo "vagrant-ubuntu-${suite}-${arch}" > ${mp}/etc/hostname
279
273
 
280
274
# Make sure the users own their stuff
281
275
xchroot chown -R vagrant: /home/vagrant
321
315
    mongodb-server
322
316
        btrfs-tools
323
317
        python-pip
 
318
        libnss-myhostname
324
319
    )
325
320
 
326
321
if [ "${suite}" == "precise" ]; then