almalinux/lorax
12
0
Fork 0
Code Issues Pull Requests Releases Activity

runtime-cleanup: Use branding package name instead of product.name

Browse Source 
Related: rhbz#1956205
This commit is contained in:
Brian C. Lane 2021-05-03 11:26:37 -07:00
parent 980e628835
commit 04dccefa5b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
share/templates.d/99-generic/runtime-cleanup.tmpl
View File

@ -1,5 +1,5 @@
## lorax template file: cleanup for the ramdisk (runtime image) ## lorax template file: cleanup for the ramdisk (runtime image)
<%page args="libdir, product, root"/> <%page args="libdir, branding, root"/>
## remove the sources ## remove the sources
remove usr/share/i18n 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 ## we don't create new initramfs/bootloader conf inside anaconda
## (that happens inside the target system after we install dracut/grubby) ## (that happens inside the target system after we install dracut/grubby)
removepkg dracut-network grubby anaconda-dracut 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 ## 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 ## We also need dracut-shutdown.service and dracut-initramfs-restore to reboot
removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh \ removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh \
@ -305,9 +304,13 @@ removefrom xorg-x11-drv-openchrome /usr/${libdir}/libchrome*
removefrom xorg-x11-drv-wacom /usr/bin/* removefrom xorg-x11-drv-wacom /usr/bin/*
removefrom xorg-x11-fonts-misc --allbut /usr/share/X11/fonts/misc/{6x13,encodings,fonts,*cursor}* removefrom xorg-x11-fonts-misc --allbut /usr/share/X11/fonts/misc/{6x13,encodings,fonts,*cursor}*
removefrom xorg-x11-server-utils --allbut /usr/bin/xrandr /usr/bin/xrdb removefrom xorg-x11-server-utils --allbut /usr/bin/xrandr /usr/bin/xrdb
removefrom ${product.name}-logos /etc/*
removefrom ${product.name}-logos /usr/share/icons/{Bluecurve,oxygen}/* %if branding.release:
removefrom ${product.name}-logos /usr/share/{firstboot,kde4,pixmaps}/* 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 ## cleanup /boot/ leaving vmlinuz, and .*hmac files
runcmd chroot ${root} find /boot \! -name "vmlinuz*" \ runcmd chroot ${root} find /boot \! -name "vmlinuz*" \