Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package smartmontools for openSUSE:Factory
checked in at 2022-02-18 23:02:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/smartmontools (Old)
and /work/SRC/openSUSE:Factory/.smartmontools.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smartmontools"
Fri Feb 18 23:02:46 2022 rev:86 rq:955710 version:7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/smartmontools/smartmontools.changes
2021-12-02 02:26:57.812252828 +0100
+++ /work/SRC/openSUSE:Factory/.smartmontools.new.1958/smartmontools.changes
2022-02-18 23:03:05.581412139 +0100
@@ -1,0 +2,7 @@
+Thu Feb 17 14:50:19 UTC 2022 - Stanislav Brabec <sbra...@suse.com>
+
+- Restart smartd and generate smartd_opts only if there are real
+ sysconfig changes; do not trigger generate_smartd_opts by YaST,
+ systemd is enough (bsc#1195785).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ smartmontools.spec ++++++
--- /var/tmp/diff_new_pack.NsRpb6/_old 2022-02-18 23:03:07.829411964 +0100
+++ /var/tmp/diff_new_pack.NsRpb6/_new 2022-02-18 23:03:07.833411963 +0100
@@ -1,7 +1,7 @@
#
# spec file for package smartmontools
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -173,6 +173,9 @@
%post
# First prepare sysconfig.
%{fillup_only}
+# Up to Leap 42.3 and SLE 15 SP3 Maintenance Update there was a "Command" meta
comment in the sysconfig file.
+# It is not needed any more, but fillup does not delete it. Do it explicitly.
(bsc#1195785, bsc#1196103)
+sed -i
'\@^##[[:space:]]*Command:[[:space:]]*/usr/lib/smartmontools/generate_smartd_opts$@d'
/etc/sysconfig/smartmontools
# Then generate initial %%{_localstatedir}/lib/smartmontools/smartd_opts
needed by smartd.service.
SMARTD_SKIP_INIT=1 %{_prefix}/lib/smartmontools/generate_smartd_opts
# No start by default here.. belongs to -presets packages
++++++ smartmontools.generate_smartd_opts.in ++++++
--- /var/tmp/diff_new_pack.NsRpb6/_old 2022-02-18 23:03:07.949411954 +0100
+++ /var/tmp/diff_new_pack.NsRpb6/_new 2022-02-18 23:03:07.953411954 +0100
@@ -14,6 +14,9 @@
# Following code should be in sync with sysv init script for older distros!
# source configuration file.
+smartd_opts=
+[ -r @localstatedir@/lib/smartmontools/smartd_opts ] && .
@localstatedir@/lib/smartmontools/smartd_opts
+smartd_opts_old="$smartd_opts"
[ -r /etc/sysconfig/smartmontools ] && . /etc/sysconfig/smartmontools
smartd_opts=
if test -n "$SMARTD_CHECK_INTERVAL" -a "$SMARTD_CHECK_INTERVAL" != 1800 ; then
@@ -35,6 +38,10 @@
smartd_opts="$smartd_opts $SMARTD_EXTRA_OPTS"
fi
+if test "$smartd_opts" = "$smartd_opts_old" ; then
+ exit 0
+fi
+
mkdir -p @localstatedir@/lib/smartmontools
echo "# Generated by @prefix@/lib/smartmontools/generate_smartd_opts
++++++ smartmontools.sysconfig ++++++
--- /var/tmp/diff_new_pack.NsRpb6/_old 2022-02-18 23:03:07.993411951 +0100
+++ /var/tmp/diff_new_pack.NsRpb6/_new 2022-02-18 23:03:07.997411951 +0100
@@ -1,6 +1,5 @@
## Path: Hardware/S.M.A.R.T.
## Description: Hard disc health monitoring
-## Command: /usr/lib/smartmontools/generate_smartd_opts
## Type: integer(10:)
## Default: 1800
