lee/gsmartcontrol
1
0
Fork 0
mirror of https://github.com/ashaduri/gsmartcontrol.git synced 2026-09-26 05:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated some docs.

Browse Source 
Proper filtering of /dev/sd* devices with older smartctl and 3ware.
Added missing file to Makefile.am.
This commit is contained in:
Alexander Shaduri
2011-06-01 07:44:43 +00:00
parent c2955b508c
commit 9440de5ca9
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gsmartcontrol/configure-dev
+1 -1
View File
@@ -31,7 +31,7 @@ case $type in
flags="CC=i386-pc-mingw32-gcc CXX=i386-pc-mingw32-g++ \
PKG_CONFIG_PATH=/cross/w32/target/lib/pkgconfig PKG_CONFIG_LIBDIR=\"\" \
PATH=\"/cross/w32/gcc-bin:/cross/w32/target/bin:$PATH\" \
--with-windows-gtk-name=gtk2-runtime-2.16.6-2010-02-24-ash --disable-user-flags \
--with-windows-gtk-name=gtk2-runtime-2.16.6-2010-05-12-ash --disable-user-flags \
--enable-optimize-options --enable-tests --build=i686-linux --host=i386-pc-mingw32" ;;
win32-debug)
flags="CC=i386-pc-mingw32-gcc CXX=i386-pc-mingw32-g++ \
gsmartcontrol/data/nsis/distribution-nogtk.txt.in
+1 -1
View File
@@ -20,7 +20,7 @@ binary was compiled for 32-bit Windows, and should work on both 32-bit and
64-bit Windows. The binary was statically compiled against Gtkmm
(http://www.gtkmm.org/) and related libraries, and PCRE (http://www.pcre.org/).
* Smartctl binaries (from smartmontools 5.39.1, http://smartmontools.sf.net/)
* Smartctl binaries (from smartmontools 5.41, http://smartmontools.sf.net/)
- smartctl-nc.exe (compiled without console output), smartctl.exe (compiled
with console output).
gsmartcontrol/data/nsis/distribution.txt.in
+1 -1
View File
@@ -16,7 +16,7 @@ binary was compiled for 32-bit Windows, and should work on both 32-bit and
64-bit Windows. The binary was statically compiled against Gtkmm
(http://www.gtkmm.org/) and related libraries, and PCRE (http://www.pcre.org/).
* Smartctl binaries (from smartmontools 5.39.1, http://smartmontools.sf.net/)
* Smartctl binaries (from smartmontools 5.41, http://smartmontools.sf.net/)
- smartctl-nc.exe (compiled without console output), smartctl.exe (compiled
with console output).
gsmartcontrol/src/applib/Makefile.am
+1 -1
View File
@@ -9,7 +9,7 @@ libapplib_a_SOURCES = app_gtkmm_utils.cpp app_pango_utils.cpp cmdex.cpp \
noinst_HEADERS = app_gtkmm_features.h app_gtkmm_utils.h app_pango_utils.h \
app_pcrecpp.h app_ui_res_utils.h cmdex.h cmdex_sync.h cmdex_sync_gui.h executor_factory.h gui_utils.h \
selftest.h smartctl_executor.h smartctl_executor_gui.h smartctl_parser.h \
storage_detector.h storage_detector_linux.h storage_detector_other.h \
storage_detector.h storage_detector_helpers.h storage_detector_linux.h storage_detector_other.h \
storage_detector_win32.h storage_device.h storage_property.h storage_property_colors.h \
storage_property_descr.h storage_settings.h tw_cli_executor.h wrapping_label.h
gsmartcontrol/src/applib/storage_detector_linux.cpp
+3 -2
View File
@@ -342,8 +342,9 @@ inline std::string detect_drives_linux_proc_partitions(std::vector<StorageDevice
drive->fetch_basic_data_and_parse(smartctl_ex);
// 3ware controllers also export themselves as sd*. Smartctl detects that,
// so we can avoid adding them.
if (!app_pcre_match("/AMCC/3ware controller/im", drive->get_info_output())) {
// so we can avoid adding them. Older smartctl (5.38) prints "AMCC", newer one
// prints "AMCC/3ware controller".
if (!app_pcre_match("/AMCC/im", drive->get_info_output()) && !app_pcre_match("/3ware controller/im", drive->get_info_output())) {
drives.push_back(drive);
}
}