From 0f1b124a2b5bf620197318b0fbe9a506d4c7e6e9 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 13 Oct 2010 08:26:42 -0400 Subject: [PATCH] populate-initrd: pre-expand logofile variable The logofile by default is $datadir/plymouth.png $datadir contains a reference to $datarootdir, so we need to preexpand the variable in configure, for the right value to get written to plymouth-populate-initrd. --- configure.ac | 1 + scripts/plymouth-populate-initrd.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 664a6c7d..b5927340 100644 --- a/configure.ac +++ b/configure.ac @@ -155,6 +155,7 @@ AM_CONDITIONAL(START_FROM_GDM, [test "$with_gdm_autostart_file" = yes]) AC_ARG_WITH(logo, AS_HELP_STRING([--with-logo],[logo used by boot splash plugins]),logofile=${withval},logofile=$datadir/plymouth/bizcom.png) AC_SUBST(logofile) +AS_AC_EXPAND(PLYMOUTH_LOGO_FILE, $logofile) AM_CONDITIONAL(INSTALL_FALLBACK_LOGO, [test "$logofile" = $datadir/plymouth/bizcom.png]) diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in index 52d43ae7..4c0168f0 100755 --- a/scripts/plymouth-populate-initrd.in +++ b/scripts/plymouth-populate-initrd.in @@ -5,7 +5,7 @@ [ -z "$PLYMOUTH_LIBEXECDIR" ] && PLYMOUTH_LIBEXECDIR="@PLYMOUTH_LIBEXECDIR@" [ -z "$PLYMOUTH_DATADIR" ] && PLYMOUTH_DATADIR="@PLYMOUTH_DATADIR@" [ -z "$PLYMOUTH_PLUGIN_PATH" ] && PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)" -[ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@" +[ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@PLYMOUTH_LOGO_FILE@" [ -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@" -- 2.47.3