From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Mar 2011 03:41:47 +0000 (+0100)
Subject: units: on mandriva/fedora create single.service alias via symlink, not Names=
X-Git-Tag: v21~45
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1c66c44ef9e312805295395d728e47cdd08335c;p=systemd

units: on mandriva/fedora create single.service alias via symlink, not Names=
---

diff --git a/Makefile.am b/Makefile.am
index 93225aac..3120e786 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1411,8 +1411,9 @@ if TARGET_FEDORA
 		rm -f halt-local.service && \
 		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f display-manager.service && \
-		$(LN_S) prefdm.service display-manager.service )
+		rm -f display-manager.service single.service && \
+		$(LN_S) prefdm.service display-manager.service && \
+                $(LN_S) rescue.service single.service )
 	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
@@ -1427,8 +1428,9 @@ if TARGET_MANDRIVA
 		rm -f halt-local.service && \
 		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f display-manager.service && \
-		$(LN_S) prefdm.service display-manager.service )
+		rm -f display-manager.service single.service && \
+		$(LN_S) prefdm.service display-manager.service && \
+                $(LN_S) rescue.service single.service )
 	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
index 8b42e9f6..969ac472 100644
--- a/units/rescue.service.m4
+++ b/units/rescue.service.m4
@@ -13,9 +13,6 @@ DefaultDependencies=no
 Conflicts=shutdown.target
 After=basic.target
 Before=shutdown.target
-m4_ifdef(`TARGET_MANDRIVA',
-`# Hide SysV script
-Names=single.service')
 
 [Service]
 Environment=HOME=/root