Imported Upstream version 6.1+svn3812

[mirror_smartmontools-debian.git] / smartd.initd.in

diff --git a/smartd.initd.in b/smartd.initd.in
index 7e0fe60c04d67805430109329e9f5496e64ffa85..0c1e52c6de9df214d9455c650a3ee03137621eba 100644 (file)
--- a/smartd.initd.in
+++ b/smartd.initd.in
@@ -2,7 +2,7 @@
 
 # smartmontools init file for smartd
 # Copyright (C) 2002-8 Bruce Allen <smartmontools-support@lists.sourceforge.net>
-# $Id: smartd.initd.in 3360 2011-06-06 19:25:36Z chrfranke $
+# $Id: smartd.initd.in 3727 2012-12-13 17:23:06Z samm2 $
 
 # For RedHat and cousins:
 # chkconfig: 2345 40 40
@@ -27,8 +27,8 @@
 # Software Foundation; either version 2, or (at your option) any later
 # version. 
 # You should have received a copy of the GNU General Public License (for
-# example COPYING); if not, write to the Free Software Foundation, Inc., 675
-# Mass Ave, Cambridge, MA 02139, USA.
+# example COPYING); if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 # This code was originally developed as a Senior Thesis by Michael Cornwell
 # at the Concurrent Systems Laboratory (now part of the Storage Systems
 # Research Center), Jack Baskin School of Engineering, University of
@@ -227,6 +227,15 @@ elif [ -f /etc/SuSE-release ] ; then
     if test -n "$SMARTD_DRIVEDB" ; then
        smartd_opts="$smartd_opts -B $SMARTD_DRIVEDB"
     fi
+    if test "$SMARTD_SAVESTATES" = "no" ; then
+       smartd_opts="$smartd_opts -s \"\""
+    fi
+    if test "$SMARTD_ATTRLOG" = "no" ; then
+       smartd_opts="$smartd_opts -A \"\""
+    fi
+    if test -n "$SMARTD_EXTRA_OPTS" ; then
+       smartd_opts="$smartd_opts $SMARTD_EXTRA_OPTS"
+    fi
 
     # Shell functions sourced from /etc/rc.status:
     #      rc_check         check and set local and overall rc status
@@ -269,7 +278,7 @@ elif [ -f /etc/SuSE-release ] ; then
 
            # We don't use startproc - we need to check for return code 17.
            if ! /sbin/checkproc $SMARTD_BIN ; then
-               $SMARTD_BIN $smartd_opts
+               eval $SMARTD_BIN$smartd_opts
                # Remember status and be verbose
                if test $? -ne 17 ; then
                    rc_status -v