glenux/vagrant-lxc-ng
glenux/vagrant-lxc-ng
1
0
Fork 0
Code Issues 4 Pull requests Projects 1 Releases Packages Wiki Activity

Revert "Lets ensure the rootfs is always set before starting the container"

Browse source 
This reverts commit c6af4fab08 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`
This commit is contained in:
Fabio Rehm 2013-07-12 01:21:27 -03:00
parent b97081be0d
commit 78499202b6
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/vagrant-lxc/driver.rb
View file

@ -30,7 +30,7 @@ module Vagrant
end end
def rootfs_path def rootfs_path
Pathname.new(base_path.join('rootfs')) Pathname.new(base_path.join('config').read.match(/^lxc\.rootfs\s+=\s+(.+)$/)[1])
end end
def create(name, template_path, config_file, template_options = {}) def create(name, template_path, config_file, template_options = {})
@ -65,7 +65,6 @@ module Vagrant
extra = ['-o', ENV['LXC_START_LOG_FILE'], '-l', 'DEBUG'] extra = ['-o', ENV['LXC_START_LOG_FILE'], '-l', 'DEBUG']
end end
customizations = customizations + @customizations customizations = customizations + @customizations
customizations += [['rootfs', rootfs_path.to_s]]
@cli.transition_to(:running) { |c| c.start(customizations, (extra || nil)) } @cli.transition_to(:running) { |c| c.start(customizations, (extra || nil)) }
end end