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

Fix various issues related to recent default permissions changes to /var/lib/lxc [GH-180]

Browse source
This commit is contained in:
Fabio Rehm 2013-11-06 19:29:39 -02:00
parent 02f85e4e59
commit c8f379c764
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,11 +36,15 @@ module Vagrant
end end
def rootfs_path def rootfs_path
Pathname.new(base_path.join('config').read.match(/^lxc\.rootfs\s+=\s+(.+)$/)[1]) Pathname.new(config_string.match(/^lxc\.rootfs\s+=\s+(.+)$/)[1])
end end
def mac_address def mac_address
@mac_address ||= base_path.join('config').read.match(/^lxc\.network\.hwaddr\s+=\s+(.+)$/)[1] @mac_address ||= config_string.match(/^lxc\.network\.hwaddr\s+=\s+(.+)$/)[1]
end
def config_string
@sudo_wrapper.run('cat', base_path.join('config').to_s)
end end
def create(name, template_path, config_file, template_options = {}) def create(name, template_path, config_file, template_options = {})
@ -106,19 +110,17 @@ module Vagrant
# TODO: Pass in tmpdir so we can clean up from outside # TODO: Pass in tmpdir so we can clean up from outside
target_path = "#{Dir.mktmpdir}/rootfs.tar.gz" target_path = "#{Dir.mktmpdir}/rootfs.tar.gz"
Dir.chdir base_path do @logger.info "Compressing '#{rootfs_path}' rootfs to #{target_path}"
@logger.info "Compressing '#{rootfs_path}' rootfs to #{target_path}" cmds = [
@sudo_wrapper.run('rm', '-f', 'rootfs.tar.gz') "cd #{base_path}",
# "vagrant package" will copy the existing lxc-template in the new box file "rm -f rootfs.tar.gz",
# To keep this function backwards compatible with existing boxes, the path "tar --numeric-owner -czf #{target_path} -C #{rootfs_path} './.'"
# included in the tarball needs to have the same amount of path components (2) ]
# that will be stripped before extraction, hence the './.' @sudo_wrapper.su_c(cmds.join(' && '))
@sudo_wrapper.run('tar', '--numeric-owner', '-czf', target_path, '-C', "#{rootfs_path}", './.')
@logger.info "Changing rootfs tarball owner" @logger.info "Changing rootfs tarball owner"
user_details = Etc.getpwnam(Etc.getlogin) user_details = Etc.getpwnam(Etc.getlogin)
@sudo_wrapper.run('chown', "#{user_details.uid}:#{user_details.gid}", target_path) @sudo_wrapper.run('chown', "#{user_details.uid}:#{user_details.gid}", target_path)
end
target_path target_path
end end