haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guests/openbsd: Ensure that `PKG_PATH` is set when installing rsync 

Depending on the shell, `PKG_PATH` is not necessarily set when Vagrant
runs `pkg_add`.

Ref: GH-2917
This commit is contained in:
Teemu Matilainen 2014-02-03 23:17:54 -03:00
parent bc7496d21c
commit 3b5d6c65fd
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/guests/netbsd/cap/rsync.rb
View File

@ -8,8 +8,8 @@ module VagrantPlugins
def self.rsync_install(machine) def self.rsync_install(machine)
machine.communicate.sudo( machine.communicate.sudo(
'export PKG_PATH="http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/' \ 'PKG_PATH="http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/' \
'`uname -m`/`uname -r | cut -d. -f1-2`/All"; ' \ '`uname -m`/`uname -r | cut -d. -f1-2`/All" ' \
'pkg_add rsync') 'pkg_add rsync')
end end

7
plugins/guests/openbsd/cap/rsync.rb
View File

@ -3,9 +3,10 @@ module VagrantPlugins
module Cap module Cap
class RSync class RSync
def self.rsync_install(machine) def self.rsync_install(machine)
machine.communicate.tap do |comm| machine.communicate.sudo(
comm.sudo("pkg_add -I rsync--") 'PKG_PATH="http://ftp.openbsd.org/pub/OpenBSD/' \
end '`uname -r`/packages/`arch -s`/" ' \
'pkg_add -I rsync--')
end end
def self.rsync_installed(machine) def self.rsync_installed(machine)