Remove code for migration from systemv-style init script

This commit is contained in:
Petr Písař 2013-05-20 10:53:22 +02:00
parent 0713020a81
commit a6e2e4dd68

View File

@ -5,16 +5,16 @@ Name: quota
Summary: System administration tools for monitoring users' disk usage
Epoch: 1
Version: 4.01
Release: 5%{?dist}
Release: 6%{?dist}
License: BSD and GPLv2+
URL: http://sourceforge.net/projects/linuxquota/
Group: System Environment/Base
Requires: initscripts >= 6.38 tcp_wrappers
Requires: tcp_wrappers
Requires: quota-nls = %{epoch}:%{version}-%{release}
Conflicts: kernel < 2.4
BuildRequires: e2fsprogs-devel gettext tcp_wrappers-devel
BuildRequires: openldap-devel dbus-devel libnl-devel
BuildRequires: systemd-units
BuildRequires: systemd
Source0: http://downloads.sourceforge.net/linuxquota/%{name}-%{version}.tar.gz
Source1: quota_nld.service
Source2: quota_nld.sysconfig
@ -51,9 +51,9 @@ and limiting user and or group disk usage per file system.
Summary: quota_nld daemon
Group: System Environment/Base
Requires: quota-nls = %{epoch}:%{version}-%{release}
Requires(post): systemd-sysv systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%description nld
Daemon that listens on netlink socket and processes received quota warnings.
@ -187,15 +187,6 @@ install -p -m644 -D %{SOURCE2} \
%postun nld
%systemd_postun_with_restart quota_nld.service
%triggerun -- %{name}-nld < 1:4.00-2
echo 'quota-nld: User must migrate to systemd target manually by runnig:'
echo ' systemd-sysv-convert --apply quota_nld'
# Save the current service runlevel info
/usr/bin/systemd-sysv-convert --save quota_nld >/dev/null 2>&1 || :
# Run these because the SysV package being removed won't do them
/sbin/chkconfig --del quota_nld >/dev/null 2>&1 || :
/bin/systemctl try-restart quota_nld.service >/dev/null 2>&1 || :
%files
%attr(0755,root,root) /sbin/*
@ -237,6 +228,10 @@ echo ' systemd-sysv-convert --apply quota_nld'
%changelog
* Mon May 20 2013 Petr Pisar <ppisar@redhat.com> - 1:4.01-6
- Remove code for migration from systemv-style init script
- Drop useless dependency on initscripts (bug #964440)
* Thu Mar 14 2013 Petr Pisar <ppisar@redhat.com> - 1:4.01-5
- Add quotasync(1) manual page
- Fix quota, repquota, and quotasync usage help