Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index f72c4dff6d1fa7792f1404301f2eb6be8ce5e5b9..146b250c4f3d825470ba80e4fd230155c088b6c6 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -68,7 +68,7 @@
 * clamav-0.95.2
 * cmake-2.4.8
 * collectd-4.5.3
-* compat-wireless-2.6.31-rc7-kmod-2.6.27.31-ipfire
+* compat-wireless-2009-06-17-kmod-2.6.27.31-ipfire
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-005

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index ebf035f3a7c4629b0b8d2a75010915bf2fc16f3a..f88d6bc3289e38ee82afb1916ce547ec451c912c 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,7 +30,7 @@ else
        VERSUFIX=ipfire
 endif
 
-VER        = 2.6.31-rc7
+VER        = 2009-06-17
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3b12d104a64a6bdebf8896d54d9ad7bb
+$(DL_FILE)_MD5 = 9aeba3a4c19cbfb87df45a304ba7d5ba
 
 install : $(TARGET)
 

diff --git a/src/misc-progs/smartctrl.c b/src/misc-progs/smartctrl.c
index 5715fd7544010be6e680e741f1007cf8df65d376..945c279f50164183ff4302af134c4ee633a86e73 100644 (file)
--- 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 /dev/%s", argv[1]);
+        sprintf(command, "smartctl -x /dev/%s", argv[1]);
         safe_system(command);
 
         return 0;