[systemd-commits] configure.ac Makefile.am units/fedora units/plymouth-halt.service units/plymouth-kexec.service units/plymouth-poweroff.service units/plymouth-quit.service units/plymouth-read-write.service units/plymouth-reboot.service units/plymouth-start.service
Kay Sievers
kay at kemper.freedesktop.org
Tue Feb 8 10:04:46 PST 2011
Makefile.am | 41 ++++++++++++++++++-------------
configure.ac | 4 +++
units/fedora/plymouth-halt.service | 18 -------------
units/fedora/plymouth-kexec.service | 18 -------------
units/fedora/plymouth-poweroff.service | 18 -------------
units/fedora/plymouth-quit.service | 15 -----------
units/fedora/plymouth-read-write.service | 16 ------------
units/fedora/plymouth-reboot.service | 18 -------------
units/fedora/plymouth-start.service | 18 -------------
units/plymouth-halt.service | 18 +++++++++++++
units/plymouth-kexec.service | 18 +++++++++++++
units/plymouth-poweroff.service | 18 +++++++++++++
units/plymouth-quit.service | 15 +++++++++++
units/plymouth-read-write.service | 16 ++++++++++++
units/plymouth-reboot.service | 18 +++++++++++++
units/plymouth-start.service | 18 +++++++++++++
16 files changed, 149 insertions(+), 138 deletions(-)
New commits:
commit cd3f8b7ddb052ab5e4eab420968bae689db3899a
Author: Jeff Mahoney <jeffm at suse.com>
Date: Tue Feb 8 18:47:32 2011 +0100
plymouth: move plymouth out of TARGET_FEDORA
diff --git a/Makefile.am b/Makefile.am
index e796543..f6ad809 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 1363b86..4e7db29 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/fedora/plymouth-halt.service
deleted file mode 100644
index fa1a20a..0000000
--- a/units/fedora/plymouth-halt.service
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Show Plymouth Halt Screen
-After=getty at tty1.service prefdm.service plymouth-start.service
-Before=halt.service
-DefaultDependencies=no
-
-[Service]
-ExecStart=/sbin/plymouthd --mode=shutdown
-ExecStartPost=-/bin/plymouth --show-splash
-ExecStartPost=-/bin/plymouth message '--text=Halting...'
-Type=forking
diff --git a/units/fedora/plymouth-kexec.service b/units/fedora/plymouth-kexec.service
deleted file mode 100644
index 61c6376..0000000
--- a/units/fedora/plymouth-kexec.service
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Show Plymouth Reboot with kexec Screen
-After=getty at tty1.service prefdm.service plymouth-start.service
-Before=kexec.service
-DefaultDependencies=no
-
-[Service]
-ExecStart=/sbin/plymouthd --mode=shutdown
-ExecStartPost=-/bin/plymouth --show-splash
-ExecStartPost=-/bin/plymouth message '--text=Rebooting with kexec...'
-Type=forking
diff --git a/units/fedora/plymouth-poweroff.service b/units/fedora/plymouth-poweroff.service
deleted file mode 100644
index c1eebb5..0000000
--- a/units/fedora/plymouth-poweroff.service
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Show Plymouth Power Off Screen
-After=getty at tty1.service prefdm.service plymouth-start.service
-Before=poweroff.service
-DefaultDependencies=no
-
-[Service]
-ExecStart=/sbin/plymouthd --mode=shutdown
-ExecStartPost=-/bin/plymouth --show-splash
-ExecStartPost=-/bin/plymouth message '--text=Powering Off...'
-Type=forking
diff --git a/units/fedora/plymouth-quit.service b/units/fedora/plymouth-quit.service
deleted file mode 100644
index 6310eff..0000000
--- a/units/fedora/plymouth-quit.service
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Terminate Plymouth Boot Screen
-Before=getty at tty1.service
-After=dev-tty1.device rc-local.service plymouth-start.service
-
-[Service]
-ExecStart=-/bin/plymouth quit
-Type=oneshot
diff --git a/units/fedora/plymouth-read-write.service b/units/fedora/plymouth-read-write.service
deleted file mode 100644
index 09fbf7d..0000000
--- a/units/fedora/plymouth-read-write.service
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Tell Plymouth To Write Out Runtime Data
-DefaultDependencies=no
-After=local-fs.target
-Before=sysinit.target
-
-[Service]
-ExecStart=-/bin/plymouth update-root-fs --read-write
-Type=oneshot
diff --git a/units/fedora/plymouth-reboot.service b/units/fedora/plymouth-reboot.service
deleted file mode 100644
index 974db31..0000000
--- a/units/fedora/plymouth-reboot.service
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Show Plymouth Reboot Screen
-After=getty at tty1.service prefdm.service plymouth-start.service
-Before=reboot.service
-DefaultDependencies=no
-
-[Service]
-ExecStart=/sbin/plymouthd --mode=shutdown
-ExecStartPost=-/bin/plymouth --show-splash
-ExecStartPost=-/bin/plymouth message '--text=Rebooting...'
-Type=forking
diff --git a/units/fedora/plymouth-start.service b/units/fedora/plymouth-start.service
deleted file mode 100644
index 61cb82c..0000000
--- a/units/fedora/plymouth-start.service
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Show Plymouth Boot Screen
-DefaultDependencies=no
-Wants=systemd-ask-password-plymouth.path
-After=systemd-vconsole-setup.service udev-settle.service
-Before=systemd-ask-password-plymouth.service
-
-[Service]
-ExecStart=/sbin/plymouthd --mode=boot
-ExecStartPost=-/bin/plymouth --show-splash
-Type=forking
diff --git a/units/plymouth-halt.service b/units/plymouth-halt.service
new file mode 100644
index 0000000..fa1a20a
--- /dev/null
+++ b/units/plymouth-halt.service
@@ -0,0 +1,18 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Show Plymouth Halt Screen
+After=getty at tty1.service prefdm.service plymouth-start.service
+Before=halt.service
+DefaultDependencies=no
+
+[Service]
+ExecStart=/sbin/plymouthd --mode=shutdown
+ExecStartPost=-/bin/plymouth --show-splash
+ExecStartPost=-/bin/plymouth message '--text=Halting...'
+Type=forking
diff --git a/units/plymouth-kexec.service b/units/plymouth-kexec.service
new file mode 100644
index 0000000..61c6376
--- /dev/null
+++ b/units/plymouth-kexec.service
@@ -0,0 +1,18 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Show Plymouth Reboot with kexec Screen
+After=getty at tty1.service prefdm.service plymouth-start.service
+Before=kexec.service
+DefaultDependencies=no
+
+[Service]
+ExecStart=/sbin/plymouthd --mode=shutdown
+ExecStartPost=-/bin/plymouth --show-splash
+ExecStartPost=-/bin/plymouth message '--text=Rebooting with kexec...'
+Type=forking
diff --git a/units/plymouth-poweroff.service b/units/plymouth-poweroff.service
new file mode 100644
index 0000000..c1eebb5
--- /dev/null
+++ b/units/plymouth-poweroff.service
@@ -0,0 +1,18 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Show Plymouth Power Off Screen
+After=getty at tty1.service prefdm.service plymouth-start.service
+Before=poweroff.service
+DefaultDependencies=no
+
+[Service]
+ExecStart=/sbin/plymouthd --mode=shutdown
+ExecStartPost=-/bin/plymouth --show-splash
+ExecStartPost=-/bin/plymouth message '--text=Powering Off...'
+Type=forking
diff --git a/units/plymouth-quit.service b/units/plymouth-quit.service
new file mode 100644
index 0000000..6310eff
--- /dev/null
+++ b/units/plymouth-quit.service
@@ -0,0 +1,15 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Terminate Plymouth Boot Screen
+Before=getty at tty1.service
+After=dev-tty1.device rc-local.service plymouth-start.service
+
+[Service]
+ExecStart=-/bin/plymouth quit
+Type=oneshot
diff --git a/units/plymouth-read-write.service b/units/plymouth-read-write.service
new file mode 100644
index 0000000..09fbf7d
--- /dev/null
+++ b/units/plymouth-read-write.service
@@ -0,0 +1,16 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Tell Plymouth To Write Out Runtime Data
+DefaultDependencies=no
+After=local-fs.target
+Before=sysinit.target
+
+[Service]
+ExecStart=-/bin/plymouth update-root-fs --read-write
+Type=oneshot
diff --git a/units/plymouth-reboot.service b/units/plymouth-reboot.service
new file mode 100644
index 0000000..974db31
--- /dev/null
+++ b/units/plymouth-reboot.service
@@ -0,0 +1,18 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Show Plymouth Reboot Screen
+After=getty at tty1.service prefdm.service plymouth-start.service
+Before=reboot.service
+DefaultDependencies=no
+
+[Service]
+ExecStart=/sbin/plymouthd --mode=shutdown
+ExecStartPost=-/bin/plymouth --show-splash
+ExecStartPost=-/bin/plymouth message '--text=Rebooting...'
+Type=forking
diff --git a/units/plymouth-start.service b/units/plymouth-start.service
new file mode 100644
index 0000000..61cb82c
--- /dev/null
+++ b/units/plymouth-start.service
@@ -0,0 +1,18 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Show Plymouth Boot Screen
+DefaultDependencies=no
+Wants=systemd-ask-password-plymouth.path
+After=systemd-vconsole-setup.service udev-settle.service
+Before=systemd-ask-password-plymouth.service
+
+[Service]
+ExecStart=/sbin/plymouthd --mode=boot
+ExecStartPost=-/bin/plymouth --show-splash
+Type=forking
More information about the systemd-commits
mailing list