Don't clash with initscripts for now, so that we don't break the builders

This commit is contained in:
Lennart Poettering 2010-11-17 02:26:19 +01:00
parent 52a550101a
commit cedca86fca

View File

@ -2,7 +2,7 @@ Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Version: 12 Version: 12
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Summary: A System and Service Manager Summary: A System and Service Manager
@ -99,6 +99,9 @@ ln -s ../bin/systemctl %{buildroot}/sbin/runlevel
# them. # them.
rm -r %{buildroot}/etc/systemd/system/*.target.wants rm -r %{buildroot}/etc/systemd/system/*.target.wants
# These are for now in the initscript package
rm %{buildroot}/lib/systemd/system/{halt,poweroff,prefdm,rc-local,reboot,graphical.target.wants/display-manager,multi-user.target.wants/rc-local}.service
# We haven't updated Fedora for tmpfs on /var/run and /var/lock yet # We haven't updated Fedora for tmpfs on /var/run and /var/lock yet
rm %{buildroot}/lib/systemd/system/local-fs.target.wants/var-run.mount rm %{buildroot}/lib/systemd/system/local-fs.target.wants/var-run.mount
rm %{buildroot}/lib/systemd/system/local-fs.target.wants/var-lock.mount rm %{buildroot}/lib/systemd/system/local-fs.target.wants/var-lock.mount
@ -229,6 +232,9 @@ fi
%{_mandir}/man1/systemadm.* %{_mandir}/man1/systemadm.*
%changelog %changelog
* Wed Nov 17 2010 Lennart Poettering <lpoetter@redhat.com> - 12-2
- Don't clash with initscripts for now, so that we don't break the builders
* Wed Nov 17 2010 Lennart Poettering <lpoetter@redhat.com> - 12-1 * Wed Nov 17 2010 Lennart Poettering <lpoetter@redhat.com> - 12-1
- New upstream release - New upstream release