driver: Fix lxc config customizations prunning [GH-279]
This commit is contained in:
parent
1cf8ce50e4
commit
c580865ab2
1 changed files with 5 additions and 8 deletions
|
@ -143,7 +143,7 @@ module Vagrant
|
||||||
# Use sed to just strip out the block of code which was inserted by Vagrant
|
# Use sed to just strip out the block of code which was inserted by Vagrant
|
||||||
@logger.debug 'Prunning vagrant-lxc customizations'
|
@logger.debug 'Prunning vagrant-lxc customizations'
|
||||||
contents = config_string
|
contents = config_string
|
||||||
config_string.gsub! /^# VAGRANT-BEGIN(.|\s)*# VAGRANT-END/, ''
|
contents.gsub! /^# VAGRANT-BEGIN(.|\s)*# VAGRANT-END\n/, ''
|
||||||
write_config(contents)
|
write_config(contents)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -154,14 +154,11 @@ module Vagrant
|
||||||
"lxc.#{key}=#{value}"
|
"lxc.#{key}=#{value}"
|
||||||
end
|
end
|
||||||
customizations.unshift '# VAGRANT-BEGIN'
|
customizations.unshift '# VAGRANT-BEGIN'
|
||||||
customizations << '# VAGRANT-END'
|
customizations << "# VAGRANT-END\n"
|
||||||
contents = config_string
|
|
||||||
|
contents = config_string
|
||||||
|
contents << customizations.join("\n")
|
||||||
|
|
||||||
config_file = base_path.join('config').to_s
|
|
||||||
customizations.each do |line|
|
|
||||||
contents << line
|
|
||||||
contents << "\n"
|
|
||||||
end
|
|
||||||
write_config(contents)
|
write_config(contents)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue