]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
populate-initrd: install binaries to their configured location
authorEnrico Tagliavini <enrico.tagliavini@gmail.com>
Wed, 29 Jan 2014 14:18:22 +0000 (09:18 -0500)
committerRay Strode <rstrode@redhat.com>
Wed, 29 Jan 2014 14:18:22 +0000 (09:18 -0500)
If plymouth is configured --with-system-root-install=no then the
systemd unitd files will write the paths of plymouth and plymouthd
relative to /usr .  The script currently hardcodes installing them
to the initrd's /

This commit makes sure they get placed on the same part of the of
the initrd filesystem as systemd expects to find them.

https://bugs.freedesktop.org/show_bug.cgi?id=74174

scripts/plymouth-populate-initrd.in

index d25ab07ea1747d84246438db5cefc51e64c40bc7..43c7f22c91c64c6a48aadbbf55ef72e154f2d29c 100755 (executable)
@@ -373,8 +373,8 @@ done
 [ -z "$INITRDDIR" ] && usage error
 
 mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
-inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /sbin/plymouthd
-inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /bin/plymouth
+inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR
+inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR
 inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
 inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
 inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR