From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 29 Aug 2009 17:20:13 +0000 (+0200)
Subject: Removed smartctl ATA hardcoding.
X-Git-Tag: v2.5-core31~50^2~3
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=bf97c67412eabaa909ada14332fa8c238cc679b0

Removed smartctl ATA hardcoding.
New version autodetect also SATA and some USB bridges
---

diff --git a/src/initscripts/init.d/smartenabler b/src/initscripts/init.d/smartenabler
index 19403c8215..489560bd2c 100644
--- a/src/initscripts/init.d/smartenabler
+++ b/src/initscripts/init.d/smartenabler
@@ -8,7 +8,7 @@ case "$1" in
 	start)
 	        boot_mesg -n "Enabling S.M.A.R.T.: ";
 		for disk in `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`; do 
-		    /usr/sbin/smartctl -d ata --smart=on /dev/$disk > /dev/nul;
+		    /usr/sbin/smartctl --smart=on /dev/$disk > /dev/nul;
 		    if [ ${?} = 0 ]; then 
 			boot_mesg -n "$SUCCESS$disk$NORMAL ";
 		    else
diff --git a/src/misc-progs/smartctrl.c b/src/misc-progs/smartctrl.c
index 6b2bd1e200..5715fd7544 100644
--- a/src/misc-progs/smartctrl.c
+++ b/src/misc-progs/smartctrl.c
@@ -36,7 +36,7 @@ int main(int argc, char *argv[]) {
                 exit(1);
 	}
 
-        sprintf(command, "smartctl -iHA -d ata /dev/%s", argv[1]);
+        sprintf(command, "smartctl -iHA /dev/%s", argv[1]);
         safe_system(command);
 
         return 0;
diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index 817920ab73..c2baee7cca 100644
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -83,7 +83,7 @@ sub updatehdddata{
 	if (!$standby){
 		$temp = 0;
 		my $smart_output = '';
-		system("$path_smartctl -iHA -d ata /dev/$disk > /var/run/smartctl_out_hddtemp-$disk");
+		system("$path_smartctl -iHA /dev/$disk > /var/run/smartctl_out_hddtemp-$disk");
 		if ( -e "/var/run/smartctl_out_hddtemp-".$array[$#array] ){
 			my $hdd_output = `cat /var/run/smartctl_out_hddtemp-$array[$#array] | grep Temperature_`;
 			my @t = split(/\s+/,$hdd_output);