From a6f4d0dabdee4421dc0193e5cbf4863e8f5c1f4e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 3 May 2021 11:26:37 -0700 Subject: [PATCH] runtime-cleanup: Use branding package name instead of product.name Related: rhbz#1956205 (cherry picked from commit 065e0a7f8dbe3d9271483dffdd2b8f520133b532) --- share/templates.d/99-generic/runtime-cleanup.tmpl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl index a3e9bc3f..c6f6209d 100644 --- a/share/templates.d/99-generic/runtime-cleanup.tmpl +++ b/share/templates.d/99-generic/runtime-cleanup.tmpl @@ -1,5 +1,5 @@ ## lorax template file: cleanup for the ramdisk (runtime image) -<%page args="libdir, product, root"/> +<%page args="libdir, branding, root"/> ## remove the sources remove usr/share/i18n @@ -14,7 +14,6 @@ removepkg flac-libs libsndfile pulseaudio* sound-theme-freedesktop ## we don't create new initramfs/bootloader conf inside anaconda ## (that happens inside the target system after we install dracut/grubby) removepkg dracut-network grubby anaconda-dracut -removefrom ${product.name}-logos /usr/share/plymouth/* ## In order to execute the /usr move on upgrades we need convertfs from dracut ## We also need dracut-shutdown.service and dracut-initramfs-restore to reboot removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh \ @@ -304,9 +303,13 @@ removefrom xorg-x11-drv-intel /usr/${libdir}/libI* removefrom xorg-x11-drv-openchrome /usr/${libdir}/libchrome* removefrom xorg-x11-drv-wacom /usr/bin/* removefrom xorg-x11-fonts-misc --allbut /usr/share/X11/fonts/misc/{6x13,encodings,fonts,*cursor}* -removefrom ${product.name}-logos /etc/* -removefrom ${product.name}-logos /usr/share/icons/{Bluecurve,oxygen}/* -removefrom ${product.name}-logos /usr/share/{firstboot,kde4,pixmaps}/* + +%if branding.release: + removefrom ${branding.logos} /usr/share/plymouth/* + removefrom ${branding.logos} /etc/* + removefrom ${branding.logos} /usr/share/icons/{Bluecurve,oxygen}/* + removefrom ${branding.logos} /usr/share/{firstboot,kde4,pixmaps}/* +%endif ## cleanup /boot/ leaving vmlinuz, and .*hmac files runcmd chroot ${root} find /boot \! -name "vmlinuz*" \