From: Michael Prokop <mika@grml.org>
Date: Fri, 26 Apr 2024 06:53:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/github/pr/148'
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=HEAD;hp=-c;ds=sidebyside

Merge remote-tracking branch 'origin/github/pr/148'
---

40d666f4546ecee5b6ecaef07a6875a5b190892f
diff --combined docs/grml-live.txt
index ee3856f,2cedb6d..46f4890
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@@ -330,7 -330,14 +330,14 @@@ ${GRML_FAI_CONFIG}/config/package_confi
  example in ${GRML_FAI_CONFIG}/config/scripts/ so specific feature sets can be
  selected. The following classes are predefined:
  
- * DEBORPHAN: get rid of all packages listed in output of deborphan
+ * DEBORPHAN: get rid of "autoremove" and "removed-but-not-yet-purged" packages;
+ also all packages listed in output of deborphan (only if deborphan is actually
+ present, note that grml-live no longer installs deborphan by default as it's not
+ present since Debian/trixie!). This class is called as such for historic
+ reasons, and while deborphan itself is no longer relevant nowadays, the name of
+ the class was kept as such for backwards compatibility reasons. This class is
+ thought to be used *before* any further `GRML*` classes, like
+ `DEBORPHAN,GRMLBASE,GRML_FULL,RELEASE,...` to get proper Grml releases.
  
  * FRESHCLAM: execute freshclam (if it's present) to update clamav definitions
  (increases resulting ISO size ~70MB). By default it's skipped to avoid bigger
@@@ -536,7 -543,7 +543,7 @@@ Instruction
    EOF
  
    # get keyring for apt:
 -  apt-get update
 +  apt-get -o Acquire::AllowInsecureRepositories=true update
    apt-get --allow-unauthenticated install grml-debian-keyring
  
    # optionally(!) install basefile so we don't have to build basic