From 78499202b6b12b1334095f8e39f2e39b28a34cc2 Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Fri, 12 Jul 2013 01:21:27 -0300 Subject: [PATCH] Revert "Lets ensure the rootfs is always set before starting the container" This reverts commit c6af4fab084cb1b920af513ef629d75745a152fc as it is probably a better idea to have the rootfs config baked into the config file so we can easily run a `lxc-start -n CONTAINER` --- lib/vagrant-lxc/driver.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/vagrant-lxc/driver.rb b/lib/vagrant-lxc/driver.rb index c9f5388..0a46194 100644 --- a/lib/vagrant-lxc/driver.rb +++ b/lib/vagrant-lxc/driver.rb @@ -30,7 +30,7 @@ module Vagrant end def rootfs_path - Pathname.new(base_path.join('rootfs')) + Pathname.new(base_path.join('config').read.match(/^lxc\.rootfs\s+=\s+(.+)$/)[1]) end def create(name, template_path, config_file, template_options = {}) @@ -65,7 +65,6 @@ module Vagrant extra = ['-o', ENV['LXC_START_LOG_FILE'], '-l', 'DEBUG'] end customizations = customizations + @customizations - customizations += [['rootfs', rootfs_path.to_s]] @cli.transition_to(:running) { |c| c.start(customizations, (extra || nil)) } end