From bf73740db58d8c05db007575e593a6355e6f34a7 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 11 Jun 2008 17:01:07 -0400 Subject: [PATCH] Generate helper scripts so the right logo is included --- scripts/Makefile.am | 10 ++++++++-- ...uth-populate-initrd => plymouth-populate-initrd.in} | 2 +- ...lymouth-update-initrd => plymouth-update-initrd.in} | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) rename scripts/{plymouth-populate-initrd => plymouth-populate-initrd.in} (97%) rename scripts/{plymouth-update-initrd => plymouth-update-initrd.in} (97%) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index b780f2e1..3f593053 100644 --- 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 087d9f80..99a8d4d0 100755 --- 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 a71099f8..24699d97 100755 --- 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" -- 2.47.3