Revision a57ca5dc
Added by Paul Kelly about 13 years ago
- ID a57ca5dce2f725208733488b3abbb7e548143ffe
lib/proxy/dhcp/server/native_ms.rb | ||
---|---|---|
def execute cmd, msg=nil, error_only=false
|
||
tsecs = 5
|
||
response = nil
|
||
interpreter = settings.x86_64 ? 'c:\windows\sysnative\cmd.exe' : 'c:\windows\system32\cmd.exe'
|
||
interpreter = SETTINGS.x86_64 ? 'c:\windows\sysnative\cmd.exe' : 'c:\windows\system32\cmd.exe'
|
||
command = interpreter + ' /c c:\Windows\System32\netsh.exe -c dhcp ' + "server #{name} #{cmd}"
|
||
|
||
std_in = std_out = std_err = nil
|
lib/proxy/settings.rb | ||
---|---|---|
if PLATFORM =~ /mingw/
|
||
settings.delete :puppetca if settings.has_key? :puppetca
|
||
settings.delete :puppet if settings.has_key? :puppet
|
||
settings.x86_64 = File.exist?('c:\windows\sysnative\cmd.exe')
|
||
settings[:x86_64] = File.exist?('c:\windows\sysnative\cmd.exe')
|
||
end
|
||
SETTINGS = Settings.new(settings)
|
Also available in: Unified diff
Fixes 779 - windows 64 bit detection wrong
Signed-off-by: Paul kelly <paul.ian.kelly@googlemail.com>