--- embedaddon/smartmontools/os_win32/smartd_warning.cmd 2013/07/22 01:17:36 1.1.1.1 +++ embedaddon/smartmontools/os_win32/smartd_warning.cmd 2013/10/14 07:54:04 1.1.1.2 @@ -2,7 +2,7 @@ :: :: smartd warning script :: -:: Copyright (C) 2012 Christian Franke +:: Copyright (C) 2012-13 Christian Franke :: :: This program is free software; you can redistribute it and/or modify :: it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ :: You should have received a copy of the GNU General Public License :: (for example COPYING); If not, see . :: -:: $Id: smartd_warning.cmd,v 1.1.1.1 2013/07/22 01:17:36 misho Exp $ +:: $Id: smartd_warning.cmd,v 1.1.1.2 2013/10/14 07:54:04 misho Exp $ :: set err= @@ -33,7 +33,7 @@ if not "%1" == "" ( echo set SMARTD_MESSAGE='Error Message' echo set SMARTD_FAILTYPE='Type of failure, "EMailTest" for tests' echo set SMARTD_TFIRST='Date of first message sent, empty if none' - echo set SMARTD_TFIRSTEPOCH='time_t format of above' + echo :: set SMARTD_TFIRSTEPOCH='time_t format of above' echo set SMARTD_PREVCNT='Number of previous messages, 0 if none' echo set SMARTD_NEXTDAYS='Number of days until next message, empty if none' echo set SMARTD_DEVICEINFO='Device identify information' @@ -50,12 +50,17 @@ if "%SMARTD_ADDRESS%%SMARTD_MAILER%" == "" ( goto EOF ) +:: USERDNSDOMAIN may be unset if running as service +if "%USERDNSDOMAIN%" == "" ( + for /f "delims== tokens=2 usebackq" %%d in (`WMIC PATH Win32_Computersystem WHERE "PartOfDomain=TRUE" GET Domain /VALUE 2^>nul ^| find "Domain=" 2^>nul`) do set USERDNSDOMAIN=%%~d +) + :: Format subject set SMARTD_SUBJECT=SMART error (%SMARTD_FAILTYPE%) detected on host: %COMPUTERNAME% :: Temp file for message -if not "%TMP%" == "" set SMARTD_FULLMSGFILE=%TMP%\smartd_warning-%DATE%-%RANDOM%.txt -if "%TMP%" == "" set SMARTD_FULLMSGFILE=smartd_warning-%DATE%-%RANDOM%.txt +if not "%TMP%" == "" set SMARTD_FULLMSGFILE=%TMP%\smartd_warning-%RANDOM%.txt +if "%TMP%" == "" set SMARTD_FULLMSGFILE=smartd_warning-%RANDOM%.txt :: Format message (