From 677c3bd9cbb8c33f89a90c06b2e429ef958897e4 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 20 May 2008 11:21:21 -0400 Subject: [PATCH] rename the daemon from plymouth to plymouthd --- scripts/plymouth-update-initrd | 4 ++-- src/Makefile.am | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/plymouth-update-initrd b/scripts/plymouth-update-initrd index 79ada3a2..01e1b699 100755 --- 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 3baee745..bfdd1c1b 100644 --- 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 \