diff options
| -rw-r--r-- | Makefile.am | 41 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | units/plymouth-halt.service (renamed from units/fedora/plymouth-halt.service) | 0 | ||||
| -rw-r--r-- | units/plymouth-kexec.service (renamed from units/fedora/plymouth-kexec.service) | 0 | ||||
| -rw-r--r-- | units/plymouth-poweroff.service (renamed from units/fedora/plymouth-poweroff.service) | 0 | ||||
| -rw-r--r-- | units/plymouth-quit.service (renamed from units/fedora/plymouth-quit.service) | 0 | ||||
| -rw-r--r-- | units/plymouth-read-write.service (renamed from units/fedora/plymouth-read-write.service) | 0 | ||||
| -rw-r--r-- | units/plymouth-reboot.service (renamed from units/fedora/plymouth-reboot.service) | 0 | ||||
| -rw-r--r-- | units/plymouth-start.service (renamed from units/fedora/plymouth-start.service) | 0 |
9 files changed, 28 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index e796543d60..f6ad8091bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -331,14 +331,18 @@ if TARGET_FEDORA dist_systemunit_DATA += \ units/fedora/prefdm.service \ units/fedora/rc-local.service \ - units/fedora/halt-local.service \ - units/fedora/plymouth-start.service \ - units/fedora/plymouth-read-write.service \ - units/fedora/plymouth-quit.service \ - units/fedora/plymouth-reboot.service \ - units/fedora/plymouth-kexec.service \ - units/fedora/plymouth-poweroff.service \ - units/fedora/plymouth-halt.service + units/fedora/halt-local.service +endif + +if HAVE_PLYMOUTH +dist_systemunit_DATA += \ + units/plymouth-start.service \ + units/plymouth-read-write.service \ + units/plymouth-quit.service \ + units/plymouth-reboot.service \ + units/plymouth-kexec.service \ + units/plymouth-poweroff.service \ + units/plymouth-halt.service endif dist_doc_DATA = \ @@ -1271,20 +1275,13 @@ install-data-hook: ( cd $(DESTDIR)$(dbussessionservicedir) && \ rm -f org.freedesktop.systemd1.service && \ $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) -if TARGET_FEDORA +if HAVE_PLYMOUTH $(MKDIR_P) -m 0755 \ $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \ $(DESTDIR)$(systemunitdir)/reboot.target.wants \ $(DESTDIR)$(systemunitdir)/kexec.target.wants \ $(DESTDIR)$(systemunitdir)/poweroff.target.wants \ - $(DESTDIR)$(systemunitdir)/halt.target.wants \ - $(DESTDIR)$(systemunitdir)/final.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 && \ - rm -f halt-local.service && \ - $(LN_S) $(systemunitdir)/halt-local.service halt-local.service ) + $(DESTDIR)$(systemunitdir)/halt.target.wants ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ rm -f plymouth-start.service plymouth-read-write.service && \ $(LN_S) ../plymouth-start.service plymouth-start.service && \ @@ -1304,6 +1301,16 @@ if TARGET_FEDORA ( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \ rm -f plymouth-halt.service && \ $(LN_S) ../plymouth-halt.service plymouth-halt.service ) +endif + +if TARGET_FEDORA + $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.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 && \ + 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 ) diff --git a/configure.ac b/configure.ac index 1363b862bd..4e7db2996b 100644 --- a/configure.ac +++ b/configure.ac @@ -319,11 +319,13 @@ case $with_distro in SPECIAL_SYSLOG_SERVICE=rsyslog.service AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL]) M4_DISTRO_FLAG=-DTARGET_FEDORA=1 + have_plymouth=true ;; suse) SYSTEM_SYSVRCND_PATH=/etc/init.d AC_DEFINE(TARGET_SUSE, [], [Target is openSUSE/SLE]) M4_DISTRO_FLAG=-DTARGET_SUSE=1 + have_plymouth=true ;; debian) SYSTEM_SYSVRCND_PATH=/etc @@ -427,6 +429,8 @@ AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware) AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux) +AM_CONDITIONAL(HAVE_PLYMOUTH, test -n "$have_plymouth") + AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name]) AC_ARG_WITH([dbuspolicydir], diff --git a/units/fedora/plymouth-halt.service b/units/plymouth-halt.service index fa1a20a46d..fa1a20a46d 100644 --- a/units/fedora/plymouth-halt.service +++ b/units/plymouth-halt.service diff --git a/units/fedora/plymouth-kexec.service b/units/plymouth-kexec.service index 61c6376a73..61c6376a73 100644 --- a/units/fedora/plymouth-kexec.service +++ b/units/plymouth-kexec.service diff --git a/units/fedora/plymouth-poweroff.service b/units/plymouth-poweroff.service index c1eebb5ac2..c1eebb5ac2 100644 --- a/units/fedora/plymouth-poweroff.service +++ b/units/plymouth-poweroff.service diff --git a/units/fedora/plymouth-quit.service b/units/plymouth-quit.service index 6310eff495..6310eff495 100644 --- a/units/fedora/plymouth-quit.service +++ b/units/plymouth-quit.service diff --git a/units/fedora/plymouth-read-write.service b/units/plymouth-read-write.service index 09fbf7d4c4..09fbf7d4c4 100644 --- a/units/fedora/plymouth-read-write.service +++ b/units/plymouth-read-write.service diff --git a/units/fedora/plymouth-reboot.service b/units/plymouth-reboot.service index 974db31d61..974db31d61 100644 --- a/units/fedora/plymouth-reboot.service +++ b/units/plymouth-reboot.service diff --git a/units/fedora/plymouth-start.service b/units/plymouth-start.service index 61cb82cde4..61cb82cde4 100644 --- a/units/fedora/plymouth-start.service +++ b/units/plymouth-start.service |