Skip to content

Commit

Permalink
Remove deprecated /etc/grml/fai/config/scripts/GRML_SMALL/98-clean-ch…
Browse files Browse the repository at this point in the history
…root

After executing `grml-live -s trixie -a amd64 -c
GRMLBASE,GRML_SMALL,AMD64,SOURCES` and while debugging the issue that
got fixed within commit d77d042 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 6225bfa.

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
  • Loading branch information
mika committed Dec 18, 2024
1 parent f649d51 commit c950cbe
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 25 deletions.
3 changes: 2 additions & 1 deletion debian/grml-live.maintscript
Original file line number Diff line number Diff line change
@@ -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~
Expand All @@ -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~
24 changes: 0 additions & 24 deletions etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot

This file was deleted.

0 comments on commit c950cbe

Please sign in to comment.