move /tmp cleanup to attach command, fixes lvm rootfs

fgrehm · Apr 6, 2015 · 12c1ba2 · 12c1ba2
1 parent c9cd671
commit 12c1ba2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 27 deletions.
diff --git a/lib/vagrant-lxc/action.rb b/lib/vagrant-lxc/action.rb
@@ -13,7 +13,6 @@
 require 'vagrant-lxc/action/prepare_nfs_settings'
 require 'vagrant-lxc/action/prepare_nfs_valid_ids'
 require 'vagrant-lxc/action/private_networks'
-require 'vagrant-lxc/action/remove_temporary_files'
 require 'vagrant-lxc/action/setup_package_files'
 require 'vagrant-lxc/action/warn_networks'
 
@@ -126,7 +125,6 @@ def self.action_halt
             end
 
             b2.use ClearForwardedPorts
-            b2.use RemoveTemporaryFiles
             b2.use GcPrivateNetworkBridges
             b2.use Builtin::Call, Builtin::GracefulHalt, :stopped, :running do |env2, b3|
               if !env2[:result]

diff --git a/lib/vagrant-lxc/action/remove_temporary_files.rb b/lib/vagrant-lxc/action/remove_temporary_files.rb
diff --git a/lib/vagrant-lxc/driver/cli.rb b/lib/vagrant-lxc/driver/cli.rb
@@ -86,7 +86,7 @@ def start(options = [])
         end
 
         def stop
-          attach '/sbin/halt' if supports_attach?
+          attach 'rm -rf /tmp/* && /sbin/halt'
           run :stop, '--name', @name
         end
 

diff --git a/spec/unit/driver/cli_spec.rb b/spec/unit/driver/cli_spec.rb
@@ -165,7 +165,7 @@
       end
 
       it 'runs a /sbin/halt within the container' do
-        expect(subject).to have_received(:attach).with('/sbin/halt')
+        expect(subject).to have_received(:attach).with('rm -rf /tmp/* && /sbin/halt')
       end
 
       it 'issues a lxc-stop with provided container name' do