From cedca86fcadb5f1e9874857311366fb7384f8222 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Nov 17 2010 01:26:19 +0000 Subject: Don't clash with initscripts for now, so that we don't break the builders --- diff --git a/systemd.spec b/systemd.spec index ed64390..aeb6bb5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -2,7 +2,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Version: 12 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Summary: A System and Service Manager @@ -99,6 +99,9 @@ ln -s ../bin/systemctl %{buildroot}/sbin/runlevel # them. 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 rm %{buildroot}/lib/systemd/system/local-fs.target.wants/var-run.mount rm %{buildroot}/lib/systemd/system/local-fs.target.wants/var-lock.mount @@ -229,6 +232,9 @@ fi %{_mandir}/man1/systemadm.* %changelog +* Wed Nov 17 2010 Lennart Poettering - 12-2 +- Don't clash with initscripts for now, so that we don't break the builders + * Wed Nov 17 2010 Lennart Poettering - 12-1 - New upstream release