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

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index da845af..46f4890 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -330,7 +330,14 @@ ${GRML_FAI_CONFIG}/config/package_config whereas some further classes are define
 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 @@ Instructions
   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

diff --git a/etc/grml/fai/config/files/etc/fstab/GRMLBASE b/etc/grml/fai/config/files/etc/fstab/GRMLBASE
index 9a5698a..ffd52b7 100644 (file)
--- a/etc/grml/fai/config/files/etc/fstab/GRMLBASE
+++ b/etc/grml/fai/config/files/etc/fstab/GRMLBASE
@@ -16,11 +16,11 @@ devpts         /dev/pts         devpts noauto,mode=0622                      0
 /dev/dvd       /media/dvd       auto   user,noauto,exec,ro                   0      0
 # some other examples:
 # /dev/hda1      /Grml         ext3    dev,suid,user,noauto 0  2
-# //1.2.3.4/pub  /smb/pub      smbfs   defaults,user,noauto,uid=grml,gid=grml 0 0
+# //192.0.2.42/pub  /smb/pub      smbfs   defaults,user,noauto,uid=grml,gid=grml 0 0
 # linux:/pub     /beer         nfs     defaults             0  0
 # tmpfs          /tmp          tmpfs   size=300M            0  0
 # none           /proc/bus/usb usbfs   defaults,nodev,noexec,nosuid,noauto,devgid=1001,devmode=664 0 0
-# 192.168.1.101:/backups /media/nfs nfs  defaults,user,wsize=8192,rsize=8192 0 0
+# 192.0.2.42:/backups /media/nfs nfs  defaults,user,wsize=8192,rsize=8192 0 0
 #
 # Warning! Please do *not* change any lines below because they are auto-generated.
 # If you want to disable rebuildfstab set CONFIG_FSTAB='no' in /etc/grml/autoconfig.

diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index 115df2d..40fbb0d 100644 (file)
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -6,7 +6,6 @@ console-data
 console-setup
 cryptsetup-initramfs
 dbus
-deborphan
 dmidecode
 efibootmgr
 eject

diff --git a/etc/grml/fai/config/scripts/DEBORPHAN/98-clean-chroot b/etc/grml/fai/config/scripts/DEBORPHAN/98-clean-chroot
index 42ed9c2..dce15d4 100755 (executable)
--- a/etc/grml/fai/config/scripts/DEBORPHAN/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/DEBORPHAN/98-clean-chroot
@@ -9,21 +9,10 @@
 set -u
 set -e
 
-if ! [ -x $target/usr/bin/deborphan ] ; then
-  echo "Warning: deborphan not installed"
-  exit 0
-fi
-
 # remove all packages not necessary anymore:
 echo "Executing apt-get -y --purge autoremove"
 $ROOTCMD apt-get -y --purge autoremove
 
-# remove packages until deborphan does not find anymore:
-while [ "$($ROOTCMD deborphan)" != "" ] ; do
-  echo "Executing deborphan"
-  $ROOTCMD apt-get -y --purge remove $($ROOTCMD deborphan)
-done
-
 # make sure we don't have any removed but not-yet-purged packages left,
 # otherwise GRMLBASE/03-get-sources might try to download unavailable
 # packages and will fail doing so
@@ -34,5 +23,15 @@ if [ -n "$PURGE_PACKAGES" ] ; then
   $ROOTCMD dpkg --purge $PURGE_PACKAGES
 fi
 
+# note: deborphan is no longer available as of Debian/trixie,
+# see https://github.com/grml/grml-live/issues/144
+if [ -x "$target"/usr/bin/deborphan ] ; then
+  # remove packages until deborphan does not find anymore:
+  while [ "$($ROOTCMD deborphan)" != "" ] ; do
+    echo "Executing deborphan"
+    $ROOTCMD apt-get -y --purge remove $($ROOTCMD deborphan)
+  done
+fi
+
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2