diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG index fa6d7fe705dd5eed95ca4d2e2dc8bb387f164a80..9b99af6f522fb8a3b8747d8905dda9690aca9066 100644 --- a/sm5/CHANGELOG +++ b/sm5/CHANGELOG @@ -1,6 +1,6 @@ CHANGELOG for smartmontools -$Id: CHANGELOG,v 1.616 2007/05/31 17:57:29 ballen4705 Exp $ +$Id: CHANGELOG,v 1.617 2007/06/05 20:41:10 shattered Exp $ The most recent version of this file is: http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup @@ -33,6 +33,9 @@ NOTES FOR FUTURE RELEASES: see TODO file. <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE> + [SS] Applied patch from Dean Bennett to fix scheduled tests on + Highpoint RAID controllers. + [BA] Added patch from Tejun Heo http://thread.gmane.org/gmane.linux.ide/13222/focus=13235 to fix broken auto-offline and auto-save via libata. Very clean fix: does it "the right way". Thanks Tejun! diff --git a/sm5/smartd.cpp b/sm5/smartd.cpp index 8089fdce6fc200ce1c5375e2add53298bbb0be3b..bae3db8d8972563f39f0aba947c8d2b13871b0d9 100644 --- a/sm5/smartd.cpp +++ b/sm5/smartd.cpp @@ -119,14 +119,14 @@ extern "C" int getdomainname(char *, int); // no declaration in header files! extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid, *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid; -static const char *filenameandversion="$Id: smartd.cpp,v 1.389 2007/05/13 14:33:33 guidog Exp $"; +static const char *filenameandversion="$Id: smartd.cpp,v 1.390 2007/06/05 20:41:10 shattered Exp $"; #ifdef NEED_SOLARIS_ATA_CODE extern const char *os_solaris_ata_s_cvsid; #endif #ifdef _WIN32 extern const char *daemon_win32_c_cvsid, *hostname_win32_c_cvsid, *syslog_win32_c_cvsid; #endif -const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.389 2007/05/13 14:33:33 guidog Exp $" +const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.390 2007/06/05 20:41:10 shattered Exp $" ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID #ifdef DAEMON_WIN32_H_CVSID DAEMON_WIN32_H_CVSID @@ -2269,6 +2269,10 @@ int ATACheckDevice(cfgfile *cfg){ con->controller_port=cfg->controller_port; con->controller_type=cfg->controller_type; con->controller_explicit=cfg->controller_explicit; + // Highpoint-specific data + con->hpt_data[0]=cfg->hpt_data[0]; + con->hpt_data[1]=cfg->hpt_data[1]; + con->hpt_data[2]=cfg->hpt_data[2]; // If user has asked, test the email warning system if (cfg->mailwarn && cfg->mailwarn->emailtest)