diff options
| author | Brett Witherspoon <spoonb@cdspooner.com> | 2010-10-11 22:05:24 -0500 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2010-10-13 08:20:44 -0400 |
| commit | d7f59d9dc29c73fd72a7c0823ad5738211863b39 (patch) | |
| tree | f5fbd5514caa1f5b9ff3e066f6260fa830f2a1f3 /scripts | |
| parent | 07329b72687ccc7a9015de4a48fae297d6d5ff96 (diff) | |
populate-initrd: don't hardcode client and daemon path
When not installing in system root, the populate initrd script would not
install the client or daemon due to the paths being hardcoded.
Environmental variables are also now available to override the defaults.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/plymouth-populate-initrd.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in index 7a2f0ca1..52d43ae7 100755 --- a/scripts/plymouth-populate-initrd.in +++ b/scripts/plymouth-populate-initrd.in @@ -9,6 +9,8 @@ [ -z "$PLYMOUTH_THEME_NAME" ] && PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme) [ -z "$PLYMOUTH_CONFDIR" ] && PLYMOUTH_CONFDIR="@PLYMOUTH_CONF_DIR@" [ -z "$PLYMOUTH_POLICYDIR" ] && PLYMOUTH_POLICYDIR="@PLYMOUTH_POLICY_DIR@" +[ -z "$PLYMOUTH_DAEMON_PATH" ] && PLYMOUTH_DAEMON_PATH="@PLYMOUTH_DAEMON_DIR@/plymouthd" +[ -z "$PLYMOUTH_CLIENT_PATH" ] && PLYMOUTH_CLIENT_PATH="@PLYMOUTH_CLIENT_DIR@/plymouth" if [ -z "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then @@ -72,8 +74,8 @@ set_verbose $verbose || : [ -z "$INITRDDIR" ] && usage error mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes -inst /sbin/plymouthd $INITRDDIR /bin/plymouthd -inst /bin/plymouth $INITRDDIR +inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /bin/plymouthd +inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /bin/plymouth 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 |