build-ubuntu-ami 1.0.1 → 2.0.0

data/data/user_data.sh.erb

@@ -4,11 +4,18 @@
 # Log output to the console, syslog, and /var/log/user-data.log
 exec > >(tee /var/log/user-data.log|logger -t user-data -s 2>/dev/console) 2>&1
 
-# Download and mount the clean image
+# Download and extract the clean image
 image=/mnt/<%= image_name %>.img
-imagedir=/mnt/<%= image_name %>-cloudimg-<%= arch %>
-wget -qO- <%= image_url %> |
-  tar xzf - -C /mnt
+imagedir=/mnt/<%= image_name %>
+wget -qO- <%= image_url %> | tar xzf - -C /mnt
+
+# The image is 1.4GB by default
+# Add 4GB for good measure
+dd if=/dev/zero bs=1024k count=4096 >> $image
+e2fsck -p -f $image
+resize2fs $image
+
+# Mount the image
 mkdir -p $imagedir
 mount -o loop $image $imagedir
 
@@ -70,7 +77,7 @@ mount $dev $ebsimagedir
 # Copy file system from temporary rootdir to EBS volume
 tar -cSf - -C $imagedir . | sudo tar xvf - -C $ebsimagedir
 
-# Unmount 
+# Unmount
 umount $imagedir
 umount $ebsimagedir
 

data/lib/build_ubuntu_ami.rb

@@ -138,7 +138,7 @@ class BuildUbuntuAmi
     puts "waiting for user_data to complete and server to shut down..."
     puts "Follow along by running:"
     puts "  ssh -l #{server.username} #{server.dns_name} 'tail -f /var/log/user-data.log'"
-    server.wait_for { state == 'stopped' }
+    server.wait_for(60*60*24*7) { state == 'stopped' }
 
     puts "Detaching volume"
     volume.server = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: build-ubuntu-ami
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog