rename the daemon from plymouth to plymouthd

diff --git a/scripts/plymouth-update-initrd b/scripts/plymouth-update-initrd
index 79ada3a2224261c35d9de55e2358fca237f6fbbe..01e1b6999e7fa55bd26b2e562f380e98cf0681a3 100755 (executable)
--- a/scripts/plymouth-update-initrd
+++ b/scripts/plymouth-update-initrd
@@ -30,7 +30,7 @@ TMPDIR="$(mktemp -d $PWD/initrd.XXXXXXXXXX)"
 
 (cd $TMPDIR
     zcat $INITRD | cpio --quiet -Hnewc -i --make-directories
-    sed -i -e 's@^#!\(.*\)@#!/bin/plymouth \1\n@' init 
+    sed -i -e 's@^#!\(.*\)@#!/bin/plymouthd \1\n@' init 
     #sed -i -e 's@setquiet@&\n/bin/rhgb-client --ask-for-password@' init 
     (cd $LIBDIR
         DEPS=$(get_lib_deps ${LIBEXECDIR}/plymouth/plymouth ${LIBDIR}/plymouth/fedora-fade-in.so ${LIBDIR}/plymouth/text.so ${LIBDIR}/plymouth/details.so)
@@ -41,7 +41,7 @@ TMPDIR="$(mktemp -d $PWD/initrd.XXXXXXXXXX)"
     /sbin/ldconfig -n $LIB 
     /sbin/ldconfig -n .${LIBDIR}
 
-    install -m755 ${LIBEXECDIR}/plymouth/plymouth bin
+    install -m755 ${LIBEXECDIR}/plymouth/plymouthd bin
     install -m755 ${BINDIR}/rhgb-client bin
 
     mkdir -p ${TMPDIR}$DATADIR/plymouth

diff --git a/src/Makefile.am b/src/Makefile.am
index 3baee74545b0ec23f2f72fa63177735cc2dac379..bfdd1c1b3b31352ef1623416500425c06dbfe579 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,13 +2,13 @@ SUBDIRS = libply . splash-plugins rhgb-client tests
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)/libply                                                 \
            -I$(srcdir)
-plymouthbindir = $(libexecdir)/plymouth
-plymouthbin_PROGRAMS = plymouth
+plymouthdbindir = $(libexecdir)/plymouth
+plymouthdbin_PROGRAMS = plymouthd
 
-plymouth_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLYMOUTH_PLUGIN_PATH=\"$(libdir)/plymouth/\"
-plymouth_LDADD = $(PLYMOUTH_LIBS) libply/libply.la
-plymouth_SOURCES =                                                            \
-                  ply-boot-protocol.h                                        \
+plymouthd_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLYMOUTH_PLUGIN_PATH=\"$(libdir)/plymouth/\"
+plymouthd_LDADD = $(PLYMOUTH_LIBS) libply/libply.la
+plymouthd_SOURCES =                                                            \
+                   ply-boot-protocol.h                                        \
                    ply-boot-server.h                                          \
                    ply-boot-server.c                                          \
                    ply-boot-splash-plugin.h                                   \