From b7d7f54fbff9bac09a1c57ec704fbdd4787d5383 Mon Sep 17 00:00:00 2001 From: Chris Hofstaedtler Date: Wed, 18 Dec 2024 17:17:12 +0100 Subject: [PATCH] Rework wallpaper handling Previously we used fai to copy the base image for the desktop wallpaper, but used the font directly from the host. Unify this situation by using both from the host. To find the font and the wallpaper, put them both into TEMPLATE_DIRECTORY, and include this variable in CONFIGDUMP. --- debian/copyright | 2 +- debian/grml-live.install | 2 +- debian/grml-live.maintscript | 1 + etc/grml/fai/config/scripts/GRMLBASE/42-branding | 1 - .../config/scripts/GRMLBASE/47-update-wallpaper | 15 ++++++++------- .../config/scripts/RELEASE/99-update-wallpaper | 12 ++++++------ grml-live | 2 +- templates/wallpaper/font.otf | 1 + .../wallpaper}/graphicoreBitmapFont0-Light.otf | Bin .../GRMLBASE => templates/wallpaper/input.png | Bin 10 files changed, 19 insertions(+), 17 deletions(-) create mode 120000 templates/wallpaper/font.otf rename {fonts => templates/wallpaper}/graphicoreBitmapFont0-Light.otf (100%) rename etc/grml/fai/config/files/usr/share/grml/desktop-bg.png/GRMLBASE => templates/wallpaper/input.png (100%) diff --git a/debian/copyright b/debian/copyright index f47ca9f78..88ab873c0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ Files: * Copyright: 2007-2023 Michael Prokop License: GPL-2+ -Files: fonts/graphicoreBitmapFont0-Light.otf +Files: templates/wallpaper/graphicoreBitmapFont0-Light.otf Copyright: 2010, Lasse Fister lasse@graphicore.de License: SIL diff --git a/debian/grml-live.install b/debian/grml-live.install index a9cfbac79..0d05a2267 100644 --- a/debian/grml-live.install +++ b/debian/grml-live.install @@ -2,7 +2,6 @@ docs/grml-live-remaster.8 usr/share/man/man8/ docs/grml-live.8 usr/share/man/man8/ etc/grml etc examples usr/share/doc/grml-live/ -fonts usr/share/grml-live/ grml-live usr/sbin/ remaster/grml-live-remaster usr/sbin/ scripts usr/share/grml-live/ @@ -11,4 +10,5 @@ templates/GRML usr/share/grml-live/templates/ templates/boot/grub usr/share/grml-live/templates/boot/ templates/boot/isolinux usr/share/grml-live/templates/boot/ templates/secureboot usr/share/grml-live/templates/ +templates/wallpaper usr/share/grml-live/templates/ templates/windows usr/share/grml-live/templates/ diff --git a/debian/grml-live.maintscript b/debian/grml-live.maintscript index 64e76edf8..8e3fd25ca 100644 --- a/debian/grml-live.maintscript +++ b/debian/grml-live.maintscript @@ -4,6 +4,7 @@ rm_conffile /etc/grml/fai/config/files/etc/inittab/GRML_SMALL 0.43.0~ rm_conffile /etc/grml/fai/config/files/etc/locale.gen/GRML_FULL 0.49.3~ rm_conffile /etc/grml/fai/config/files/etc/lsb-base-logging.sh/GRMLBASE 0.42.3~ rm_conffile /etc/grml/fai/config/files/etc/systemd/system/serial-getty@ttyS0.service.d/override.conf/GRMLBASE 0.33.2~ +rm_conffile /etc/grml/fai/config/files/usr/share/grml/desktop-bg.png/GRMLBASE 0.49.4~ rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils 0.33.0~ rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/37-portmap 0.49.2~ rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/40-deborphan 0.35.0~ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/42-branding b/etc/grml/fai/config/scripts/GRMLBASE/42-branding index 89daa8e92..5026662f1 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/42-branding +++ b/etc/grml/fai/config/scripts/GRMLBASE/42-branding @@ -10,7 +10,6 @@ set -u set -e fcopy -m root,root,0755 -v /usr/share/initramfs-tools/scripts/init-top/grml -fcopy -M -v /usr/share/grml/desktop-bg.png fcopy -M -v /usr/share/doc/grml-docs/startpage.html ## END OF FILE ################################################################# diff --git a/etc/grml/fai/config/scripts/GRMLBASE/47-update-wallpaper b/etc/grml/fai/config/scripts/GRMLBASE/47-update-wallpaper index 937e0b99d..528156bd4 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/47-update-wallpaper +++ b/etc/grml/fai/config/scripts/GRMLBASE/47-update-wallpaper @@ -12,19 +12,22 @@ target=${target:?} # shellcheck source=/dev/null . "$GRML_LIVE_CONFIG" -FONTFILE=${FONTFILE:-/usr/share/grml-live/fonts/graphicoreBitmapFont0-Light.otf} TITLE_FONTSIZE=${TITLE_FONTSIZE:-200} VERSION_FONTSIZE=${VERSION_FONTSIZE:-100} -GRML_BG=${GRML_BG:-"$target"/usr/share/grml/desktop-bg.png} GRML_WALLPAPER=${GRML_WALLPAPER:-"$target"/usr/share/grml/desktop.jpg} +FONTFILE="$TEMPLATE_DIRECTORY"/wallpaper/font.otf +GRML_BG="$TEMPLATE_DIRECTORY"/wallpaper/input.png + +echo "Creating GRMLBASE wallpaper" + if [ ! -x "$(which convert)" ]; then - echo "convert not installed, skipping wallpaper." - exit 0 + echo "convert not installed, skipping wallpaper." + exit 0 fi if [ ! -f "$GRML_BG" ]; then - echo "Could not find Grml background image, skipping wallpaper" + echo "Could not find input image $GRML_BG, skipping wallpaper" exit 0 fi @@ -33,8 +36,6 @@ if [ ! -f "$FONTFILE" ]; then exit 0 fi -echo "Creating standard wallpaper" - convert "$GRML_BG" -gravity center \ -fill white -font "$FONTFILE" \ -pointsize "$TITLE_FONTSIZE" \ diff --git a/etc/grml/fai/config/scripts/RELEASE/99-update-wallpaper b/etc/grml/fai/config/scripts/RELEASE/99-update-wallpaper index 564b93f81..6eebf0bda 100755 --- a/etc/grml/fai/config/scripts/RELEASE/99-update-wallpaper +++ b/etc/grml/fai/config/scripts/RELEASE/99-update-wallpaper @@ -12,12 +12,13 @@ target=${target:?} # shellcheck source=/dev/null . "$GRML_LIVE_CONFIG" -FONTFILE=${FONTFILE:-/usr/share/grml-live/fonts/graphicoreBitmapFont0-Light.otf} TITLE_FONTSIZE=${TITLE_FONTSIZE:-200} -GRML_BG=${GRML_BG:-$target/usr/share/grml/desktop-bg.png} GRML_WALLPAPER=${GRML_WALLPAPER:-$target/usr/share/grml/desktop.jpg} -echo "Creating release wallpaper" +FONTFILE="$TEMPLATE_DIRECTORY"/wallpaper/font.otf +GRML_BG="$TEMPLATE_DIRECTORY"/wallpaper/input.png + +echo "Creating RELEASE wallpaper" if [ ! -x "$(which convert)" ]; then echo "convert not installed, skipping release wallpaper." @@ -25,16 +26,15 @@ if [ ! -x "$(which convert)" ]; then fi if [ ! -f "$GRML_BG" ]; then - echo "Could not find Grml background image, skipping release wallpaper" + echo "Could not find input image $GRML_BG, skipping wallpaper" exit 0 fi if [ ! -f "$FONTFILE" ]; then - echo "Could not find font $FONTFILE, skipping release wallpaper" + echo "Could not find font $FONTFILE, skipping wallpaper" exit 0 fi - convert "$GRML_BG" -gravity center \ -fill white -font "$FONTFILE" \ -pointsize "$TITLE_FONTSIZE" \ diff --git a/grml-live b/grml-live index c2691ac98..76c9a3ed9 100755 --- a/grml-live +++ b/grml-live @@ -654,7 +654,7 @@ einfo "Logging actions to logfile $LOGFILE" # dump config variables into file, for script access {{{ CONFIGDUMP=$(mktemp) set | grep -E \ - '^(GRML_NAME|RELEASENAME|DATE|VERSION|SUITE|ARCH|DISTRI_NAME|USERNAME|HOSTNAME|APT_PROXY)=' \ + '^(GRML_NAME|RELEASENAME|DATE|VERSION|SUITE|ARCH|DISTRI_NAME|TEMPLATE_DIRECTORY|USERNAME|HOSTNAME|APT_PROXY)=' \ > "${CONFIGDUMP}" # }}} diff --git a/templates/wallpaper/font.otf b/templates/wallpaper/font.otf new file mode 120000 index 000000000..3f6100860 --- /dev/null +++ b/templates/wallpaper/font.otf @@ -0,0 +1 @@ +graphicoreBitmapFont0-Light.otf \ No newline at end of file diff --git a/fonts/graphicoreBitmapFont0-Light.otf b/templates/wallpaper/graphicoreBitmapFont0-Light.otf similarity index 100% rename from fonts/graphicoreBitmapFont0-Light.otf rename to templates/wallpaper/graphicoreBitmapFont0-Light.otf diff --git a/etc/grml/fai/config/files/usr/share/grml/desktop-bg.png/GRMLBASE b/templates/wallpaper/input.png similarity index 100% rename from etc/grml/fai/config/files/usr/share/grml/desktop-bg.png/GRMLBASE rename to templates/wallpaper/input.png