diff options
| author | Lukas Larsson <[email protected]> | 2012-01-25 14:50:03 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-01-25 14:50:03 +0100 |
| commit | 8b129dda86fe28b943180153561423bbb7957582 (patch) | |
| tree | cf8bbbaa38085e9c9d848b3e629b1e8d2b2e8624 /lib/os_mon/src/os_mon_sysinfo.erl | |
| parent | 25a98803743f25f36377790edc4b6315639aade7 (diff) | |
| parent | 373f3227400d2cabe9c7cf3170b1cad4f5c2488a (diff) | |
| download | otp-8b129dda86fe28b943180153561423bbb7957582.tar.gz otp-8b129dda86fe28b943180153561423bbb7957582.tar.bz2 otp-8b129dda86fe28b943180153561423bbb7957582.zip | |
Merge branch 'lukas/os_mon/work_in_source_tree/OTP-9883' into maint
* lukas/os_mon/work_in_source_tree/OTP-9883:
Look for port in priv/bin/arch/ as well as priv/bin/
Diffstat (limited to 'lib/os_mon/src/os_mon_sysinfo.erl')
| -rw-r--r-- | lib/os_mon/src/os_mon_sysinfo.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/os_mon/src/os_mon_sysinfo.erl b/lib/os_mon/src/os_mon_sysinfo.erl index 5d12bd95d1..080885d5d6 100644 --- a/lib/os_mon/src/os_mon_sysinfo.erl +++ b/lib/os_mon/src/os_mon_sysinfo.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2009. All Rights Reserved. +%% Copyright Ericsson AB 1997-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -108,9 +108,7 @@ code_change(_OldVsn, State, _Extra) -> %%---------------------------------------------------------------------- start_portprogram() -> - Command = - filename:join([code:priv_dir(os_mon),"bin","win32sysinfo.exe"]), - Port = open_port({spawn,Command}, [{packet,1}]), + Port = os_mon:open_port("win32sysinfo.exe", [{packet,1}]), receive {Port, {data, [?OK]}} -> Port; |