Fedora: further unit tweaks

1) Just ship rc-local as-is; don't worry about the 'local' name.
2) Don't install rc-local and prefdm to /etc ; just enable them globally for the system in /lib.

diff --git a/Makefile.am b/Makefile.am
index 56bafdc09f5e40e6a485e434bf6ae32525bd7553..3c65febb500c56fcc7d0edc5ac9cd32c0ef0142e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1175,13 +1175,10 @@ if TARGET_FEDORA
                $(DESTDIR)$(systemunitdir)/rescue.target.wants \
                $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
                $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
+       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
                rm -f prefdm.service && \
                $(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
                rm -f rc-local.service && \
                $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
        ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
@@ -1204,8 +1201,8 @@ if TARGET_FEDORA
                rm -f plymouth-halt.service && \
                $(LN_S) ../plymouth-halt.service plymouth-halt.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f local.service && \
-               $(LN_S) rc-local.service local.service )
+               rm -f display-manager.service && \
+               $(LN_S) prefdm.service display-manager.service )
 endif
 if TARGET_GENTOO
        ( cd $(DESTDIR)$(pkgsysconfdir)/system && \

diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service
index fb276945bf6afac67df09b095e2b5c98551a4f6a..1d5d10506a96491f4767ed468b33d89c387d821b 100644 (file)
--- a/units/fedora/rc-local.service
+++ b/units/fedora/rc-local.service
@@ -9,10 +9,6 @@
 Description=/etc/rc.local Compatibility
 ConditionPathExists=/etc/rc.local
 
-# The rcN.d symlink uses the name "local" while the script itself is
-# called "rc.local", hence carry both names here.
-Names=rc-local.service local.service
-
 [Service]
 Type=forking
 Environment=TERM=linux