Skip to content
This repository has been archived by the owner on Nov 24, 2022. It is now read-only.

Add sudo for redir #259

Merged
merged 2 commits into from
May 4, 2014
Merged

Add sudo for redir #259

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b1fffc
clean redir pid with sudo only if port is < than 1024
guerremdq Apr 29, 2014
b288c05
Merge branch 'sudo-for-redir' of github.com:guerremdq/vagrant-lxc int…
guerremdq Apr 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions lib/vagrant-lxc/action/clear_forwarded_ports.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ def call(env)
if redir_pids.any?
env[:ui].info I18n.t("vagrant.actions.vm.clear_forward_ports.deleting")
redir_pids.each do |pid|
next unless is_redir_pid?(pid)
@logger.debug "Killing pid #{pid}"
system "sudo pkill -TERM -P #{pid}"
next unless is_redir_pid?(pid[0])
@logger.debug "Killing pid #{pid[0]}"
if pid[1]
system "sudo pkill -TERM -P #{pid[0]}"
else
system "pkill -TERM -P #{pid[0]}"
end
end

@logger.info "Removing redir pids files"
Expand All @@ -31,7 +35,9 @@ def call(env)

def redir_pids
@redir_pids = Dir[@env[:machine].data_dir.join('pids').to_s + "/redir_*.pid"].map do |file|
File.read(file).strip.chomp
port_number = file.split(/[^\d]/).join
privileged_port = true if Integer(port_number) > 1024
a = [ File.read(file).strip.chomp , privileged_port ]
end
end

Expand Down