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

Fix hang at nmcli call on CentOS 7.5 when ssh.pty is enabled 

`vagrant up` may hang at the "Configuring and enabling network
interfaces..." step when private networks and PTY allocation for SSH
are used.

The newer version of `nmcli` that is part of CentOS now will open a
pager (i.e. `less`) for certain commands if it finds a tty. This
causes the invocations of `nmcli` in `guest_inspection.rb` to hang.

`nmcli` disables the use of a pager in 'terse' (`-t`) output mode,
while still returning enough information for the uses in
`guest_inspection.rb`.
This commit is contained in:
Simon Baatz 2018-06-13 09:26:01 +02:00
parent e43a94b797
commit fa34f4d2af
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vagrant/util/guest_inspection.rb
View File

@ -44,7 +44,7 @@ module Vagrant
#
# @return [Boolean]
def nmcli?(comm)
comm.test("nmcli")
comm.test("nmcli -t")
end
# NetworkManager currently controls device
@ -53,8 +53,8 @@ module Vagrant
# @param device_name [String]
# @return [Boolean]
def nm_controlled?(comm, device_name)
comm.test("nmcli d show #{device_name}") &&
!comm.test("nmcli d show #{device_name} | grep unmanaged")
comm.test("nmcli -t d show #{device_name}") &&
!comm.test("nmcli -t d show #{device_name} | grep unmanaged")
end
end

8
test/unit/plugins/guests/debian/cap/configure_networks_test.rb
View File

@ -65,8 +65,8 @@ describe "VagrantPlugins::GuestDebian::Cap::ConfigureNetworks" do
end
before do
allow(comm).to receive(:test).with("nmcli d show eth1").and_return(false)
allow(comm).to receive(:test).with("nmcli d show eth2").and_return(false)
allow(comm).to receive(:test).with("nmcli -t d show eth1").and_return(false)
allow(comm).to receive(:test).with("nmcli -t d show eth2").and_return(false)
allow(comm).to receive(:test).with("ps -o comm= 1 | grep systemd").and_return(false)
allow(comm).to receive(:test).with("sudo systemctl status systemd-networkd.service").and_return(false)
allow(comm).to receive(:test).with("netplan -h").and_return(false)
@ -125,8 +125,8 @@ describe "VagrantPlugins::GuestDebian::Cap::ConfigureNetworks" do
it "uses NetworkManager if detected on device" do
allow(cap).to receive(:nm_controlled?).and_return(true)
allow(comm).to receive(:test).with("nmcli d show eth1").and_return(true)
allow(comm).to receive(:test).with("nmcli d show eth2").and_return(true)
allow(comm).to receive(:test).with("nmcli -t d show eth1").and_return(true)
allow(comm).to receive(:test).with("nmcli -t d show eth2").and_return(true)
expect(cap).to receive(:upload_tmp_file).with(comm, nm_yml)
.and_return("/tmp/vagrant-network-entry.1234")