guests/nixos: don't detect as Windows [GH-4302]
This commit is contained in:
parent
b516881d47
commit
00bd226fc7
|
@ -19,6 +19,7 @@ IMPROVEMENTS:
|
||||||
|
|
||||||
BUG FIXES:
|
BUG FIXES:
|
||||||
|
|
||||||
|
- core: Windows is not detected as NixOS in some cases. [GH-4302]
|
||||||
- core: Fix encoding issues with Windows. There are still some outlying
|
- core: Fix encoding issues with Windows. There are still some outlying
|
||||||
but this fixes a few. [GH-4159]
|
but this fixes a few. [GH-4159]
|
||||||
- commands/package: base package won't crash with exception [GH-4017]
|
- commands/package: base package won't crash with exception [GH-4017]
|
||||||
|
|
|
@ -8,7 +8,7 @@ module VagrantPlugins
|
||||||
# test -f /tmp/afile
|
# test -f /tmp/afile
|
||||||
# test -L /somelink
|
# test -L /somelink
|
||||||
# test -x /tmp/some.exe
|
# test -x /tmp/some.exe
|
||||||
|
|
||||||
cmd_parts = command.strip.split(/\s+/)
|
cmd_parts = command.strip.split(/\s+/)
|
||||||
flag = cmd_parts[1]
|
flag = cmd_parts[1]
|
||||||
path = cmd_parts[2]
|
path = cmd_parts[2]
|
||||||
|
|
|
@ -4,6 +4,12 @@ module VagrantPlugins
|
||||||
module GuestNixos
|
module GuestNixos
|
||||||
class Guest < Vagrant.plugin("2", :guest)
|
class Guest < Vagrant.plugin("2", :guest)
|
||||||
def detect?(machine)
|
def detect?(machine)
|
||||||
|
# For some reason our test passes on Windows, so just short
|
||||||
|
# circuit because we're not Windows.
|
||||||
|
if machine.config.vm.communicator == :winrm
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
machine.communicate.test("test -f /run/current-system/nixos-version")
|
machine.communicate.test("test -f /run/current-system/nixos-version")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue