Generate helper scripts so the right logo is included

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b780f2e189307f85c56894d4b07b581e01cd9bbb..3f5930536753e2d07710b78ce8abfa6652ee7723 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -6,10 +6,16 @@ initrdscript_SCRIPTS = plymouth-update-initrd plymouth-populate-initrd
 sbinscriptsdir = $(sbindir)
 sbinscripts_SCRIPTS = plymouth-set-default-plugin
 
+plymouth-update-initrd: plymouth-update-initrd.in
+       sed -e 's,[@]logofile[@],$(logofile),g' plymouth-update-initrd.in > plymouth-update-initrd
+
+plymouth-populate-initrd: plymouth-populate-initrd.in
+       sed -e 's,[@]logofile[@],$(logofile),g' plymouth-populate-initrd.in > plymouth-populate-initrd
+
 if ADD_BOOT_ENTRY
-install-data-hook:
+install-data-hook: plymouth-update-initrd plymouth-populate-initrd
        PLYMOUTH_LOGO_FILE=$(logofile) $(initrdscriptdir)/plymouth-update-initrd
 endif
 
 EXTRA_DIST=$(initrdscript_SCRIPTS) $(sbinscripts_SCRIPTS) $(noinst_SCRIPTS) default.cfg
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in plymouth-update-inird plymouth-populate-initrd

diff --git a/scripts/plymouth-populate-initrd b/scripts/plymouth-populate-initrd.in
similarity index 97%
rename from scripts/plymouth-populate-initrd
rename to scripts/plymouth-populate-initrd.in
index 087d9f80b5ad924ea94b29674b3f37d4762b67b5..99a8d4d01e1a755fc640f8d43846940381d8afd9 100755 (executable)
--- a/scripts/plymouth-populate-initrd
+++ b/scripts/plymouth-populate-initrd.in
@@ -11,7 +11,7 @@ set -e
 [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
 [ -z "$BINDIR" ] && BINDIR="/usr/bin"
 [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup"
-[ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
+[ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@"
 
 INITRDDIR=$1 && shift
 if [ -z "$INITRDDIR" ]; then

diff --git a/scripts/plymouth-update-initrd b/scripts/plymouth-update-initrd.in
similarity index 97%
rename from scripts/plymouth-update-initrd
rename to scripts/plymouth-update-initrd.in
index a71099f8fa99239cf6d582c669e94ffb865488c1..24699d97bf884d95823d2aa904e095dffd40a9e6 100755 (executable)
--- a/scripts/plymouth-update-initrd
+++ b/scripts/plymouth-update-initrd.in
@@ -12,7 +12,7 @@ set -e
 [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
 [ -z "$BINDIR" ] && BINDIR="/usr/bin"
 [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup"
-[ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
+[ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@"
 
 if [ -z "$NEW_INITRD" ]; then
   NEW_INITRD="$(dirname $INITRD)/$(basename $INITRD .img)-plymouth.img"