Hello community,
here is the log from the commit of package kdump for openSUSE:Factory checked
in at 2013-09-07 07:34:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdump (Old)
and /work/SRC/openSUSE:Factory/.kdump.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdump"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2013-03-08
11:20:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdump.new/kdump.changes 2013-09-07
07:34:24.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Sep 4 14:50:58 UTC 2013 - fcro...@suse.com
+
+- Add kdump.service to properly handle kdump initscript with
+ systemd.
+
+-------------------------------------------------------------------
New:
----
kdump.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdump.spec ++++++
--- /var/tmp/diff_new_pack.Y2jIJ9/_old 2013-09-07 07:34:25.000000000 +0200
+++ /var/tmp/diff_new_pack.Y2jIJ9/_new 2013-09-07 07:34:25.000000000 +0200
@@ -40,9 +40,13 @@
%if %suse_version > 1100
BuildRequires: libssh2-devel
%endif
+%if %suse_version > 1220
+BuildRequires: systemd
+%endif
PreReq: %insserv_prereq %fillup_prereq mkinitrd
Source: %{name}-%{version}.tar.bz2
Source2: %{name}-%{version}-rpmlintrc
+Source3: kdump.service
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2)
Provides: kdump-helpers = %{version}
@@ -50,6 +54,9 @@
# update should detect the split-off from kexec-tools
Provides: kexec-tools:/etc/init.d/kdump
Requires: kexec-tools
+%if %suse_version > 1220
+%systemd_requires
+%endif
Recommends: nfs-client cifs-utils
PreReq: coreutils sed
ExcludeArch: s390 s390x ppc
@@ -96,6 +103,16 @@
# empty directory
mkdir $RPM_BUILD_ROOT/var/crash
+%if %suse_version > 1220
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+install -m644 %{S:3} $RPM_BUILD_ROOT%{_unitdir}
+%endif
+
+%if %suse_version > 1220
+%pre
+%service_add_pre kdump.service
+%endif
+
%post
# change only permission if the file exists before /etc/sysconfig/kdump
# has been created from /var/adm/fillup-templates/sysconfig.kdump
@@ -113,10 +130,16 @@
! test -d /var/log/dump ; then
ln -snf /var/crash /var/log/dump
fi
+%if %suse_version > 1220
+%service_add_post kdump.service
+%endif
%preun
echo "Stopping kdump ..."
%stop_on_removal boot.kdump
+%if %suse_version > 1220
+%service_del_preun kdump.service
+%endif
%postun
# force regeneration of kdumprd
@@ -126,6 +149,9 @@
rm /var/log/dump &>/dev/null || true
%restart_on_update boot.kdump
%insserv_cleanup
+%if %suse_version > 1220
+%service_del_postun kdump.service
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -146,5 +172,8 @@
/lib/mkinitrd/scripts/setup-kdumpfs.sh
/lib/mkinitrd/scripts/setup-mkdumprd.sh
%config %{_sysconfdir}/udev/rules.d/70-kdump.rules
+%if %suse_version > 1220
+%{_unitdir}/kdump.service
+%endif
%changelog
++++++ kdump.service ++++++
[Unit]
Description=Load kdump kernel on startup
After=local-fs.target
[Service]
Type=oneshot
ExecStart=/etc/init.d/boot.kdump start
ExecStop=/etc/init.d/boot.kdump stop
RemainAfterExit=true
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
