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

diff --git a/Makefile.am b/Makefile.am
index 93225aac207eed04260cd5192318fe0701532fbb..3120e786473006131080b085599d28dc78567dfd 100644 (file)
--- 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 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 )
        ( 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 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 )
        ( 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 8b42e9f690c75fbde95099b3d9ea0ad70038ef23..969ac4728f7176d1fa83d9c06bfdc90bc64dfe8d 100644 (file)
--- 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
 Conflicts=shutdown.target
 After=basic.target
 Before=shutdown.target

-m4_ifdef(`TARGET_MANDRIVA',
-`# Hide SysV script
-Names=single.service')

 
 [Service]
 Environment=HOME=/root
 
 [Service]
 Environment=HOME=/root