From 9a731ec9897a9b6248f0483fcd47c060a93c5a7e Mon Sep 17 00:00:00 2001
From: Fabio Rehm <fgrehm@gmail.com>
Date: Mon, 6 May 2013 10:42:30 -0300
Subject: [PATCH] Proper base box cleanup

---
 CHANGELOG.md     | 6 +++++-
 tasks/boxes.rake | 9 +++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47ec336..e1612ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,14 @@
-## [0.?.?](https://github.com/fgrehm/vagrant-lxc/compare/v0.3.3...master) (unreleased)
+## [0.?.?](https://github.com/fgrehm/vagrant-lxc/compare/v0.3.3...master)
 
 FEATURES:
 
   - Support for building Debian boxes (tks to @Val)
   - Support for installing babushka on base boxes (tks to @Val)
 
+IMPROVEMENTS:
+
+  - Clean up base boxes files after they've been configured, resulting in smaller packages
+
 ## [0.3.3](https://github.com/fgrehm/vagrant-lxc/compare/v0.3.2...v0.3.3) (April 23, 2013)
 
 BUG FIXES:
diff --git a/tasks/boxes.rake b/tasks/boxes.rake
index 456452a..ce53851 100644
--- a/tasks/boxes.rake
+++ b/tasks/boxes.rake
@@ -1,3 +1,4 @@
+require 'pathname'
 require 'rake/tasklib'
 
 class BuildGenericBoxTask < ::Rake::TaskLib
@@ -55,7 +56,7 @@ class BuildGenericBoxTask < ::Rake::TaskLib
       download
       install_cfg_engines
       prepare_package_contents pwd
-      cleanup
+      sh 'sudo rm -rf rootfs'
       sh "tar -czf tmp-package.box ./*"
     end
 
@@ -93,6 +94,7 @@ class BuildGenericBoxTask < ::Rake::TaskLib
   end
 
   def prepare_package_contents(pwd)
+    run 'cleanup'
     sh 'sudo rm -f rootfs.tar.gz'
     sh 'sudo tar --numeric-owner -czf rootfs.tar.gz ./rootfs/*'
     sh "sudo chown #{ENV['USER']}:#{ENV['USER']} rootfs.tar.gz"
@@ -106,11 +108,6 @@ class BuildGenericBoxTask < ::Rake::TaskLib
     metadata.gsub!('RELEASE', @release)
     File.open('metadata.json', 'w') { |f| f.print metadata }
   end
-
-  def cleanup
-    run 'cleanup'
-    sh 'sudo rm -rf rootfs'
-  end
 end
 
 class BuildDebianBoxTask < BuildGenericBoxTask