Hello community,

here is the log from the commit of package smartmontools for openSUSE:Factory
checked in at Mon Jun 20 10:58:45 CEST 2011.



--------
--- smartmontools/smartmontools.changes 2011-03-21 17:48:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/smartmontools/smartmontools.changes    
2011-06-17 17:16:57.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Jun  8 20:17:25 CEST 2011 - sbra...@suse.cz
+
+- Added sysconfig options to set arbitrary smartd options and
+  disable persistent state writes and attribute log (FATE#310460).
+- Decrease log message on unsupported state writes to DEBUG
+  (FATE#310460).
+- Change sysconfig ServiceReload to ServiceRestart, otherwise
+  sysconfig changes will not take effect until restart.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  smartmontools-silent-unsupported.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ smartmontools.spec ++++++
--- /var/tmp/diff_new_pack.1brkKi/_old  2011-06-20 10:54:42.000000000 +0200
+++ /var/tmp/diff_new_pack.1brkKi/_new  2011-06-20 10:54:42.000000000 +0200
@@ -22,13 +22,14 @@
 License:        GPLv2+
 Group:          Hardware/Other
 Version:        5.40
-Release:        13
+Release:        14
 Source:         %{name}-%{version}.tar.bz2
 Source2:        smartmontools.sysconfig
 Source3:        %{name}-rpmlintrc
 Patch:          smartmontools-powersave-notify.patch
 Patch1:         smartmontools-default-enabled.patch
 Patch2:         smartmontools-lsb-init-script.patch
+Patch3:         smartmontools-silent-unsupported.patch
 Patch4:         smartmontools-removable.patch
 Patch5:         smartmontools-init-update.patch
 Patch6:         smartmontools-sysconfig.patch
@@ -75,6 +76,7 @@
 cp -a %{S:2} .
 %patch1
 %patch2
+%patch3
 %patch4
 %if %suse_version <= 1100
 # Powersave notification was available only in 10.0-11.0 and SLE10.

++++++ smartmontools-silent-unsupported.patch ++++++
Index: smartd.cpp
===================================================================
--- smartd.cpp.orig
+++ smartd.cpp
@@ -2036,7 +2036,7 @@ static int SCSIDeviceScan(dev_config & c
 
   // TODO: Build file name for state file
   if (!state_path_prefix.empty()) {
-    PrintOut(LOG_INFO, "Device: %s, persistence not yet supported for SCSI; 
ignoring -s option.\n", device);
+    PrintOut(LOG_DEBUG, "Device: %s, persistence not yet supported for SCSI; 
ignoring -s option.\n", device);
   }
   // TODO: Build file name for attribute log file
   if (!attrlog_path_prefix.empty()) {
++++++ smartmontools-sysconfig.patch ++++++
--- /var/tmp/diff_new_pack.1brkKi/_old  2011-06-20 10:54:43.000000000 +0200
+++ /var/tmp/diff_new_pack.1brkKi/_new  2011-06-20 10:54:43.000000000 +0200
@@ -1,6 +1,8 @@
---- smartd.initd.in
+Index: smartd.initd.in
+===================================================================
+--- smartd.initd.in.orig
 +++ smartd.initd.in
-@@ -141,8 +141,18 @@
+@@ -141,8 +141,24 @@ elif [ -f /etc/SuSE-release ] ; then
      # Existence of config file is optional
      SMARTD_CONFIG=/etc/smartd.conf
  
@@ -18,15 +20,21 @@
 +    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
  
     # Shell functions sourced from /etc/rc.status:
     #      rc_check         check and set local and overall rc status
-@@ -185,7 +195,7 @@
+@@ -185,7 +201,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
-+              $SMARTD_BIN$smartd_opts
++              eval $SMARTD_BIN$smartd_opts
                # Remember status and be verbose
                if test $? -ne 17 ; then
                    rc_status -v

++++++ smartmontools.sysconfig ++++++
--- /var/tmp/diff_new_pack.1brkKi/_old  2011-06-20 10:54:43.000000000 +0200
+++ /var/tmp/diff_new_pack.1brkKi/_new  2011-06-20 10:54:43.000000000 +0200
@@ -1,6 +1,6 @@
 ## Path:       Hardware/S.M.A.R.T.
 ## Description:        Hard disc health monitoring
-## ServiceReload: smartd
+## ServiceRestart: smartd
 
 ## Type:       integer(10:)
 ## Default:    1800
@@ -24,3 +24,30 @@
 # specified file.
 #
 SMARTD_DRIVEDB=""
+
+## Type:        yesno
+## Default:     yes
+#
+# Preserve SMART attributes in files and read them when smartd starts.
+# This feature is now ATA only, so you may want to disable it to supress
+# warnings. See smartd(8) option -s for details.
+#
+SMARTD_SAVESTATES="yes"
+
+## Type:        yesno
+## Default:     yes
+#
+# Enable or disable SMART attribute logging.
+# If you don't consider this log useful for you, you can disable it.
+# This feature is now ATA only, so you may want to disable it to supress
+# warnings. See smartd(8) option -s for details.
+#
+SMARTD_ATTRLOG="yes"
+
+## Type:        string
+## Default:     
+#
+# Arbitrary options passed to the smart daemon in addition to above. See
+# smartd(8) for the full list of options.
+#
+SMARTD_EXTRA_OPTS=""


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to