From 2ca594db0d1fe2ce19e4bd83d5fbd497cc390dc1 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sat, 16 Sep 2023 08:04:26 +0200 Subject: T5511: drop empty hooks This is a roundup commit to 0be277647 ("T5511: Cleanup of unused directories (and files) in order to shrink image-size") that dropy empty/commented out live-build hook scripts. --- .../hooks/live/20-rm_ddclient_hook.chroot | 12 ------ .../hooks/live/22-rm_cron_atop.chroot | 8 ---- .../hooks/live/80-delete-docs.chroot | 44 ---------------------- .../hooks/live/81-cleanup-etc-defaults.chroot | 14 ------- .../hooks/live/82-cleanup-udev-rules.chroot | 10 ----- .../hooks/live/83-cleanup-etc-motd-d.chroot | 8 ---- 6 files changed, 96 deletions(-) delete mode 100755 data/live-build-config/hooks/live/20-rm_ddclient_hook.chroot delete mode 100755 data/live-build-config/hooks/live/22-rm_cron_atop.chroot delete mode 100755 data/live-build-config/hooks/live/80-delete-docs.chroot delete mode 100755 data/live-build-config/hooks/live/81-cleanup-etc-defaults.chroot delete mode 100755 data/live-build-config/hooks/live/82-cleanup-udev-rules.chroot delete mode 100755 data/live-build-config/hooks/live/83-cleanup-etc-motd-d.chroot (limited to 'data/live-build-config') diff --git a/data/live-build-config/hooks/live/20-rm_ddclient_hook.chroot b/data/live-build-config/hooks/live/20-rm_ddclient_hook.chroot deleted file mode 100755 index f4ea265e..00000000 --- a/data/live-build-config/hooks/live/20-rm_ddclient_hook.chroot +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# Made obsolete by T5511, use rootfs/excludes instead. -# -#if [ -f /etc/dhcp/dhclient-exit-hooks.d/ddclient ]; then -# rm -f /etc/dhcp/dhclient-exit-hooks.d/ddclient -#fi -# -#if [ -f /etc/ddclient.conf ]; then -# rm -f /etc/ddclient.conf -#fi - diff --git a/data/live-build-config/hooks/live/22-rm_cron_atop.chroot b/data/live-build-config/hooks/live/22-rm_cron_atop.chroot deleted file mode 100755 index 047564bb..00000000 --- a/data/live-build-config/hooks/live/22-rm_cron_atop.chroot +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Made obsolete by T5511, use rootfs/excludes instead. -# -#if [ -f /etc/cron.d/atop ]; then -# rm -f /etc/cron.d/atop -#fi - diff --git a/data/live-build-config/hooks/live/80-delete-docs.chroot b/data/live-build-config/hooks/live/80-delete-docs.chroot deleted file mode 100755 index e7825fd0..00000000 --- a/data/live-build-config/hooks/live/80-delete-docs.chroot +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -# Made obsolete by T5511, use rootfs/excludes instead. -# -## Delete various unused files and directories in order free some space and shrink imagesize. -# -## We do not need any documentation on the system. -## Copyright/licenses files are ignored for deletion. -#shopt -s extglob -#rm -rf /usr/share/doc/*/!(copyright*|README*) /usr/share/doc-base -# -## We do not need any manpages on the system since man-binary is missing. -#rm -rf /usr/local/man -#rm -rf /usr/local/share/man -#rm -rf /usr/share/man -# -## We do not need any games on the system. -#rm -rf /usr/games -#rm -rf /usr/local/games -# -## We do not need any caches on the system (will be recreated when needed). -#rm -rf /var/cache/* -# -## We do not need any log-files on the system (will be recreated when needed). -#rm -f /var/log/alternatives.log -#rm -f /var/log/bootstrap.log -#rm -f /var/log/dpkg.log -#rm -f /var/log/apt/history.log -#rm -f /var/log/apt/term.log -#rm -f /var/log/nginx/access.log -#rm -f /var/log/nginx/error.log -#rm -f /var/log/squidguard/squidGuard.log -#rm -f /var/log/stunnel4/stunnel.log -# -## We do not need any backup-files on the system. -#rm -f /etc/sudoers.bak -#rm -f /etc/xml/catalog.old -#rm -f /etc/xml/polkitd.xml.old -#rm -f /etc/xml/xml-core.xml.old -#rm -f /root/.gnupg/pubring.kbx~ -#rm -f /var/lib/dpkg/diversions-old -#rm -f /var/lib/dpkg/status-old -#rm -f /var/lib/sgml-base/supercatalog.old - diff --git a/data/live-build-config/hooks/live/81-cleanup-etc-defaults.chroot b/data/live-build-config/hooks/live/81-cleanup-etc-defaults.chroot deleted file mode 100755 index 554f74d9..00000000 --- a/data/live-build-config/hooks/live/81-cleanup-etc-defaults.chroot +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# Made obsolete by T5511, use rootfs/excludes instead. -# -## we use systemd to control ISC daemons from within vyos-1x -#FILES="/etc/default/isc-dhcp-server /etc/default/isc-dhcp-relay" -# -#for FILE in ${FILES} -#do -# if [ -f ${FILE} ]; then -# rm -f ${FILE} -# fi -#done - diff --git a/data/live-build-config/hooks/live/82-cleanup-udev-rules.chroot b/data/live-build-config/hooks/live/82-cleanup-udev-rules.chroot deleted file mode 100755 index 0345a561..00000000 --- a/data/live-build-config/hooks/live/82-cleanup-udev-rules.chroot +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Made obsolete by T5511, use rootfs/excludes instead. -# -## 99-default.link rule always calls link_config that trying to set -## autonegotiation and duplex even for PPP interfaces. -## Need to delete this rule to prevent overhead on interface creation stage -# -#rm /lib/systemd/network/99-default.link - diff --git a/data/live-build-config/hooks/live/83-cleanup-etc-motd-d.chroot b/data/live-build-config/hooks/live/83-cleanup-etc-motd-d.chroot deleted file mode 100755 index 51116480..00000000 --- a/data/live-build-config/hooks/live/83-cleanup-etc-motd-d.chroot +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Made obsolete by T5511, use rootfs/excludes instead. -# -#if [ -f /etc/update-motd.d/10-uname ]; then -# rm -f /etc/update-motd.d/10-uname -#fi - -- cgit v1.2.3