diff options
| author | Peter Jones <pjones@redhat.com> | 2008-07-30 10:31:40 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@pjones2.localdomain> | 2008-07-30 10:31:40 -0400 |
| commit | a17deea7cac891fd95360b476fd4e1eb4cb136bd (patch) | |
| tree | f51c58c0fb54e8631fbdc6ee3b87b9c7231b0328 | |
| parent | c01d237689f1e76fdaf77f6b8fd0149b362b9293 (diff) | |
| download | plymouth-a17deea7cac891fd95360b476fd4e1eb4cb136bd.tar.gz plymouth-a17deea7cac891fd95360b476fd4e1eb4cb136bd.tar.xz plymouth-a17deea7cac891fd95360b476fd4e1eb4cb136bd.zip | |
Don't do library installation twice. Also fix some typos.
| -rwxr-xr-x | scripts/plymouth-populate-initrd.in | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in index e584ee6..d9c5156 100755 --- a/scripts/plymouth-populate-initrd.in +++ b/scripts/plymouth-populate-initrd.in @@ -57,21 +57,11 @@ set_verbose $verbose [ -z "$INITRDDIR" ] && usage error -(cd $LIBDIR - BINS="${LIBEXECDIR}/plymouth/plymouthd ${BINDIR}/plymouth ${LIBDIR}/plymouth/spinfinity.so ${LIBDIR}/plymouth/text.so ${LIBDIR}/plymouth/details.so" - for bin in $BINS ; do - DEPS=$(get_dso_deps $bin) - for dep in $DEPS; do - inst $dep $INITRDDIR - done - done -) - inst ${LIBEXECDIR}/plymouth/plymouthd $INITRDDIR /bin/plymouthd inst ${BINDIR}/plymouth $INITRDDIR inst ${LIBDIR}/plymouth/text.so $INITRDDIR inst ${LIBDIR}/plymouth/details.so $INITRDDIR -inst ${PLYMOUH_LOGO_FILE} $INITRDDIR +inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR mkdir -p ${INITRDDIR}${DATADIR}/plymouth PLUGIN_NAME=$(plymouth-set-default-plugin) @@ -87,7 +77,7 @@ if [ ! -f ${LIBDIR}/plymouth/${PLUGIN_NAME}.so ]; then fi inst ${LIBDIR}/plymouth/${PLUGIN_NAME}.so $INITRDDIR -inst ${LIBDIR}/plymouth/default.so $INITRDIR +inst ${LIBDIR}/plymouth/default.so $INITRDDIR if [ -d ${DATADIR}/plymouth/${PLUGIN_NAME} ]; then for x in ${DATADIR}/plymouth/${PLUGIN_NAME}/* ; do [ ! -f "$x" ] && break |