From c950cbecb798c8c142917de53e7e659c4c62eee8 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 18 Dec 2024 18:45:51 +0100 Subject: [PATCH] Remove deprecated /etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot After executing `grml-live -s trixie -a amd64 -c GRMLBASE,GRML_SMALL,AMD64,SOURCES` and while debugging the issue that got fixed within commit d77d0429d556ebb1129ea4b862c0728807774316 we spotted the following unexpected directory in the grml_chroot: | # ls -la $build_path/grml_chroot/tmp/grml-docs/ | total 16 | drwxr-xr-x 2 root root 4096 Dec 18 17:17 . | drwxrwxrwt 3 root root 4096 Dec 18 17:18 .. | -rw-r--r-- 1 mika mika 4101 Dec 4 2023 startpage.html This was caused by an incomplete change within commit 6225bfa01f4dfc21710f47372c05e8ed2031480e. The cleanup of /usr/share/doc was removed there (which is handled within the REMOVE_DOCS class nowadays), including the `mv $target/tmp/grml-docs $target/usr/share/doc/grml-docs` call to be able to restore the expected grml-docs afterwards again, But its related `mv $target/usr/share/doc/grml-docs $target/tmp/` was kept in place, causing this unexpected behavior. Furthermore, also the file /usr/share/ssh/blacklist.RSA-2048 is gone since many years. The package openssh-blacklist was removed from Debian in 2017-04-10, see https://tracker.debian.org/pkg/openssh-blacklist. Good riddance! There's no need to ship the file /etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot any longer, removed it accordingly. FTR, executed `wrap-and-sort -tas` to sort debian/grml-live.maintscript --- debian/grml-live.maintscript | 3 ++- .../config/scripts/GRML_SMALL/98-clean-chroot | 24 ------------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100755 etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot diff --git a/debian/grml-live.maintscript b/debian/grml-live.maintscript index 8e3fd25c..14fca349 100644 --- a/debian/grml-live.maintscript +++ b/debian/grml-live.maintscript @@ -1,4 +1,5 @@ rm_conffile /etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE 0.32.3~ +rm_conffile /etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID 0.47.10~ rm_conffile /etc/grml/fai/config/files/etc/inittab/GRMLBASE 0.43.0~ 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~ @@ -10,4 +11,4 @@ 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~ rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/93-update-usbids 0.45.0~ rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/94-update-smart-drivedb 0.49.2~ -rm_conffile /etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID 0.47.10~ +rm_conffile /etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot 0.49.4~ diff --git a/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot b/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot deleted file mode 100755 index 0cd44f95..00000000 --- a/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# Filename: ${GRML_FAI_CONFIG}/config/scripts/GRML_SMALL/98-clean-chroot -# Purpose: clean up Grml chroot on grml-small -# Authors: (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - -set -e -set -u - -# FAI sets $target, but shellcheck does not know that. -target=${target:?} - -echo "Removing /usr/share/ssh/blacklist.*" -rm -f "$target"/usr/share/ssh/blacklist.DSA-1024 "$target"/usr/share/ssh/blacklist.RSA-2048 - -echo "Cleaning documentation directories" -if [ -d "$target"/usr/share/doc/grml-docs ] ; then - mv "$target"/usr/share/doc/grml-docs "$target"/tmp/ -fi - -## END OF FILE ################################################################# -# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2