[upstart] disable -sysvinit due the conflicts with systemd (#635323)
Petr Lautrbach
plautrba at fedoraproject.org
Thu Oct 14 14:37:18 UTC 2010
commit 60860f398180a3a1bec043a724448cb2dea4924e
Author: Petr Lautrbach <plautrba at redhat.com>
Date: Thu Oct 14 16:22:47 2010 +0200
disable -sysvinit due the conflicts with systemd (#635323)
upstart.spec | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/upstart.spec b/upstart.spec
index 5f4dc42..ddfceb2 100644
--- a/upstart.spec
+++ b/upstart.spec
@@ -22,6 +22,7 @@ BuildRequires: gettext, audit-libs-devel, expat-devel
BuildRequires: dbus-devel >= 1:1.2.16, libnih-devel >= 1.0.1
Conflicts: initscripts < 9.12
Requires: sysvinit-userspace
+Obsoletes: upstart-sysvinit
%description
Upstart is an event-based replacement for the /sbin/init daemon which
@@ -68,15 +69,20 @@ mv %{buildroot}/sbin/reboot %{buildroot}/lib/upstart/reboot
mv %{buildroot}/sbin/runlevel %{buildroot}/lib/upstart/runlevel
mv %{buildroot}/sbin/shutdown %{buildroot}/lib/upstart/shutdown
mv %{buildroot}/sbin/telinit %{buildroot}/lib/upstart/telinit
-ln -sf upstart %{buildroot}/sbin/init
ln -sf reboot %{buildroot}/lib/upstart/poweroff
ln -sf reboot %{buildroot}/lib/upstart/halt
+%if 0
+# disabled due the conflicts with systemd
+ln -sf upstart %{buildroot}/sbin/init
ln -sf ../lib/upstart/reboot %{buildroot}/sbin/halt
ln -sf ../lib/upstart/reboot %{buildroot}/sbin/poweroff
ln -sf ../lib/upstart/reboot %{buildroot}/sbin/reboot
ln -sf ../lib/upstart/runlevel %{buildroot}/sbin/runlevel
ln -sf ../lib/upstart/shutdown %{buildroot}/sbin/shutdown
ln -sf ../lib/upstart/telinit %{buildroot}/sbin/telinit
+%endif
+# Remove these files due the conflicts with systemd
+rm -f %{buildroot}/%{_mandir}/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}.*
# don't ship default jobs
rm -f %{buildroot}/%{_sysconfdir}/init/*
@@ -144,6 +150,8 @@ rm -rf %{buildroot}
%{_mandir}/man8/stop.8.gz
%{_mandir}/man8/reload.8.gz
+%if 0
+# disabled due the conflicts with systemd
%files sysvinit
%defattr(-,root,root,-)
/sbin/halt
@@ -160,6 +168,7 @@ rm -rf %{buildroot}
%{_mandir}/man8/runlevel.8.gz
%{_mandir}/man8/shutdown.8.gz
%{_mandir}/man8/telinit.8.gz
+%endif
%changelog
* Wed Sep 29 2010 jkeating - 0.6.5-11
More information about the scm-commits
mailing list