Hello community,
here is the log from the commit of package smartmontools for openSUSE:Factory
checked in at 2018-07-07 21:53:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/smartmontools (Old)
and /work/SRC/openSUSE:Factory/.smartmontools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smartmontools"
Sat Jul 7 21:53:50 2018 rev:77 rq:620576 version:6.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/smartmontools/smartmontools.changes
2018-05-06 14:56:48.827274964 +0200
+++ /work/SRC/openSUSE:Factory/.smartmontools.new/smartmontools.changes
2018-07-07 21:53:56.311657487 +0200
@@ -1,0 +2,7 @@
+Fri Jun 22 13:33:42 CEST 2018 - ku...@suse.de
+
+- Add smartd_generate_opts.path and smartd_generate_opts.service
+ to update smartd_opts if sysconfig is modified. Needed for
+ [FATE#325524].
+
+-------------------------------------------------------------------
New:
----
smartd_generate_opts.path
smartd_generate_opts.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ smartmontools.spec ++++++
--- /var/tmp/diff_new_pack.vAAG41/_old 2018-07-07 21:53:57.351656165 +0200
+++ /var/tmp/diff_new_pack.vAAG41/_new 2018-07-07 21:53:57.355656159 +0200
@@ -35,6 +35,8 @@
Source6: smartmontools-drivedb_h-update.sh
# SOURCE-FEATURE-UPSTREAM smartmontools-drivedb.h bnc851276 sbra...@suse.cz --
Update of drivedb.h. (Following line is handled by
smartmontools-drivedb_h-update.sh.)
Source7: smartmontools-drivedb.h
+Source8: smartd_generate_opts.path
+Source9: smartd_generate_opts.service
# PATCH-FEATURE-OPENSUSE smartmontools-suse-default.patch sbra...@suse.cz --
Define smart SUSE defaults.
Patch4: smartmontools-suse-default.patch
# PATCH-FIX-OPENSUSE smartmontools-var-lock-subsys.patch sbra...@suse.cz -- Do
not use unsupported /var/lock/subsys.
@@ -133,6 +135,8 @@
/* smart_drivedb.h: Custom drive database. See also
%{_datadir}/smartmontools/drivedb.h. */
EOF
cp smartd.service %{buildroot}/%{_unitdir}
+cp %{SOURCE8} %{buildroot}/%{_unitdir}
+cp %{SOURCE9} %{buildroot}/%{_unitdir}
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsmartd
# INSTALL file is intended only for packagers.
rm %{buildroot}%{_defaultdocdir}/%{name}/INSTALL
@@ -153,7 +157,7 @@
grep -q "^BRANCH=\"[^\"]*\"$" update-smart-drivedb
%pre
-%service_add_pre smartd.service
+%service_add_pre smartd.service smartd_generate_opts.path
smartd_generate_opts.service
# Intelligent drivedb.h update, part 1.
# Extract drivedb.h branch for installed version. We will need it in %%post.
if test -f %{_sbindir}/update-smart-drivedb ; then
@@ -177,7 +181,7 @@
# 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
-%service_add_post smartd.service
+%service_add_post smartd.service smartd_generate_opts.path
smartd_generate_opts.service
# Intelligent drivedb.h update, part 2.
# Now we have the old system drivedb.h.rpmsave and the new packaged drivedb.h.
if test -f %{_datadir}/smartmontools/drivedb.h.rpmsave ; then
@@ -220,10 +224,10 @@
fi
%preun
-%service_del_preun smartd.service
+%service_del_preun smartd.service smartd_generate_opts.path
smartd_generate_opts.service
%postun
-%service_del_postun smartd.service
+%service_del_postun smartd.service smartd_generate_opts.path
smartd_generate_opts.service
# Clean all attrlogs and state files.
if test "$1" = 0 ; then
rm -rf %{_localstatedir}/lib/smartmontools
++++++ smartd_generate_opts.path ++++++
[Unit]
Description=Watch for changes in smartmontools sysconfig file
After=local-fs.target
[Path]
Unit=smartd_generate_opts.service
PathChanged=/etc/sysconfig/smartmontools
[Install]
WantedBy=default.target
++++++ smartd_generate_opts.service ++++++
[Unit]
Description=Update smartd options
Wants=local-fs.target
[Service]
Type=oneshot
ExecStart=/usr/lib/smartmontools/generate_smartd_opts
[Install]
WantedBy=default.target
