T5511: Cleanup of unused directories (and files) in order to shrink image-size

(cherry picked from commit e433bd4f43ba3307a8b9d88ed5beafa9721e794c)

1 files changed, 9 insertions, 30 deletions

diff --git a/data/live-build-config/rootfs/excludes b/data/live-build-config/rootfs/excludes
index 1229c0f9..2af69d7b 100644
--- a/data/live-build-config/rootfs/excludes
+++ b/data/live-build-config/rootfs/excludes
@@ -11,70 +11,49 @@
 
 # Txxx: Drop isc-dhcp helper files from /etc/default.
 # We use systemd to control ISC daemons from within vyos-1x.
-# Was: hooks/live/81-cleanup-etc-defaults.chroot
 etc/default/isc-dhcp-server
 etc/default/isc-dhcp-relay
 
 # T2185: Clean leftover files (ddclient) from base package.
-# Was: hooks/live/20-rm_ddclient_hook.chroot
 etc/dhcp/dhclient-exit-hooks.d/ddclient
 etc/ddclient.conf
 
 # T3242: Add hook to prevent link_config redundancy call in systemd-udev.
 # 99-default.link rule always calls link_config thats trying to set autonegotiation and duplex even for PPP interfaces.
 # Need to delete this rule to prevent overhead on interface creation stage.
-# Was: hooks/live/82-cleanup-udev-rules.chroot
 lib/systemd/network/99-default.link
 
 # T3774: Disabled atop services.
-# Was: hooks/live/22-rm_cron_atop.chroot
 etc/cron.d/atop
 
 # T3912: Remove superfluous motd.d kernel version shell script.
-# Was: hooks/live/83-cleanup-etc-motd-d.chroot
 etc/update-motd.d/10-uname
 
 # T4415: We do not need any documentation on the system.
 # Copyright/licenses files are ignored for deletion.
-# Was: hooks/live/80-delete-docs.chroot
 usr/share/doc/*/!(copyright*|README*)
 usr/share/doc-base
 
 # T5468: We do not need any manpages on the system since man-binary is missing.
-# Was: hooks/live/80-delete-docs.chroot
 usr/local/man/*
 usr/local/share/man/*
 usr/share/man/*
 
 # T5511: We do not need any games on the system.
-# Was: hooks/live/80-delete-docs.chroot
 usr/games/*
 usr/local/games/*
 
 # T5511: We do not need any caches on the system (will be recreated when needed).
-# Was: hooks/live/80-delete-docs.chroot
 var/cache/*
 
 # T5511: We do not need any log-files on the system (will be recreated when needed).
-# Was: hooks/live/80-delete-docs.chroot
-var/log/alternatives.log
-var/log/bootstrap.log
-var/log/dpkg.log
-var/log/apt/history.log
-var/log/apt/term.log
-var/log/nginx/access.log
-var/log/nginx/error.log
-var/log/squidguard/squidGuard.log
-var/log/stunnel4/stunnel.log
-
-# T5511: We do not need any backup-files on the system.
-# Was: hooks/live/80-delete-docs.chroot
-etc/sudoers.bak
-etc/xml/catalog.old
-etc/xml/polkitd.xml.old
-etc/xml/xml-core.xml.old
-root/.gnupg/pubring.kbx~
-var/lib/dpkg/diversions-old
-var/lib/dpkg/status-old
-var/lib/sgml-base/supercatalog.old
+var/log/*.log
+var/log/*/*.log
+var/log/*/*.log.xz
+
+# T5511: We do not need any backup-files on the system (will be recreated when needed).
+... *.bak
+... *.old
+... *.kbx~
+var/lib/dpkg/*-old