build-sys: link runlevel targets on install only if sysv compat is enabled

diff --git a/Makefile.am b/Makefile.am
index c02145badbee2c9fb2dc8a0fc3f755cb0685c46c..cd4d879ce7fea5b1ac9b3cc9d3fd78e413ada624 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -213,9 +213,10 @@ install-target-wants-hook:
        what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
 
 define add-wants
        what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
 
 define add-wants

-       dir=$(DESTDIR)$(systemunitdir)/$$wants.wants && \
-       $(MKDIR_P) -m 0755 $$dir && \
-       ( cd $$dir && \
+       [ -z "$$what" ] || ( \
+         dir=$(DESTDIR)$(systemunitdir)/$$wants.wants && \
+         $(MKDIR_P) -m 0755 $$dir && \
+         cd $$dir && \

          rm -f $$what && \
          for i in $$what; do ln -s ../$$i . || exit $$? ; done )
 endef
          rm -f $$what && \
          for i in $$what; do ln -s ../$$i . || exit $$? ; done )
 endef


@@ -3969,6 +3970,7 @@ SOCKETS_TARGET_WANTS += \
        systemd-initctl.socket \
        systemd-shutdownd.socket
 
        systemd-initctl.socket \
        systemd-shutdownd.socket
 

+if HAVE_SYSV_COMPAT

 RUNLEVEL1_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
 RUNLEVEL2_TARGET_WANTS += \
 RUNLEVEL1_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
 RUNLEVEL2_TARGET_WANTS += \


@@ -3979,6 +3981,7 @@ RUNLEVEL4_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
 RUNLEVEL5_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
        systemd-update-utmp-runlevel.service
 RUNLEVEL5_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service

+endif

 SHUTDOWN_TARGET_WANTS += \
        systemd-update-utmp-shutdown.service
 LOCAL_FS_TARGET_WANTS += \
 SHUTDOWN_TARGET_WANTS += \
        systemd-update-utmp-shutdown.service
 LOCAL_FS_TARGET_WANTS += \


@@ -4000,6 +4003,7 @@ SYSINIT_TARGET_WANTS += \
 BASIC_TARGET_WANTS += \
        systemd-tmpfiles-clean.timer
 
 BASIC_TARGET_WANTS += \
        systemd-tmpfiles-clean.timer
 

+if HAVE_SYSV_COMPAT

 SYSTEM_UNIT_ALIASES += \
        poweroff.target runlevel0.target \
        rescue.target runlevel1.target \
 SYSTEM_UNIT_ALIASES += \
        poweroff.target runlevel0.target \
        rescue.target runlevel1.target \


@@ -4007,7 +4011,9 @@ SYSTEM_UNIT_ALIASES += \
        multi-user.target runlevel3.target \
        multi-user.target runlevel4.target \
        graphical.target runlevel5.target \
        multi-user.target runlevel3.target \
        multi-user.target runlevel4.target \
        graphical.target runlevel5.target \

-       reboot.target runlevel6.target \
+       reboot.target runlevel6.target
+endif
+SYSTEM_UNIT_ALIASES += \

        graphical.target default.target \
        reboot.target ctrl-alt-del.target \
        getty@.service autovt@.service
        graphical.target default.target \
        reboot.target ctrl-alt-del.target \
        getty@.service autovt@.service


@@ -4025,13 +4031,15 @@ GENERAL_ALIASES += \
        $(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
        ../system-services/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service
 
        $(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
        ../system-services/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service
 

+if HAVE_SYSV_COMPAT

 INSTALL_DIRS += \
        $(systemunitdir)/runlevel1.target.wants \
        $(systemunitdir)/runlevel2.target.wants \
        $(systemunitdir)/runlevel3.target.wants \
        $(systemunitdir)/runlevel4.target.wants \
 INSTALL_DIRS += \
        $(systemunitdir)/runlevel1.target.wants \
        $(systemunitdir)/runlevel2.target.wants \
        $(systemunitdir)/runlevel3.target.wants \
        $(systemunitdir)/runlevel4.target.wants \

-       $(systemunitdir)/runlevel5.target.wants \
-       \
+       $(systemunitdir)/runlevel5.target.wants
+endif
+INSTALL_DIRS += \

        $(tmpfilesdir) \
        $(sysconfdir)/tmpfiles.d \
        $(prefix)/lib/modules-load.d \
        $(tmpfilesdir) \
        $(sysconfdir)/tmpfiles.d \
        $(prefix)/lib/modules-load.d \

diff --git a/TODO b/TODO
index 0bfbe1b47f58267888ef0ddd3a54164809fc4ed6..44922db9166d75df115e1f233deb64b3fac7877b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -42,8 +42,6 @@ Features:
 
 * write man page for efi boot generator
 
 
 * write man page for efi boot generator
 

-* link runlevel targets on install only if sysv compat is enabled
-

 * maybe not install getty@tty1.service symlink in /etc but in /usr?
 
 * re-enable "make check" for gtk-doc (broken for unknown reason)
 * maybe not install getty@tty1.service symlink in /etc but in /usr?
 
 * re-enable "make check" for gtk-doc (broken for unknown reason)