From ce0b07379af55bf6afc6582bca028ec4ffe9f294 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Mon, 27 Feb 2023 17:37:17 +0100
Subject: [PATCH 01/16] Release new version 0.20.4

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index acc6396..b41fde3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.20.4) grml-testing; urgency=medium
+
+  * [7bfc241] Drop support for bootlogd. Thanks to Roland Sommer for
+    reporting
+
+ -- Michael Prokop <mika@grml.org>  Mon, 27 Feb 2023 17:37:07 +0100
+
 grml-autoconfig (0.20.3) grml-testing; urgency=medium
 
   * [1e268ff] systemd unit: use StandardInput=null to work in serial
-- 
2.1.4


From 39d6dbda64bc3d54f19aa22748debeab38fc176c Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 4 Aug 2023 16:52:24 +0200
Subject: [PATCH 02/16] Depend on util-linux-extra or older util-linux

As of util-linux v2.38-1, the hwclock binary was moved
to the separate util-linux-extra package. So either depend
on util-linux-extra (available with bookworm and newer),
or older util-linux (for releases before bookworm).

Fixes:

| [ FAIL ] Problem running hwclock: config_time:36: command not found: hwclock
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index dff1c04..2230934 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,7 @@ Depends:
  rsync,
  rsyslog | system-log-daemon,
  udev,
+ util-linux-extra | util-linux (<= 2.38-1),
  zsh,
  ${misc:Depends},
  ${shlibs:Depends},
-- 
2.1.4


From 177696e68cb82a7877e0cc5cd1beddcdd53e7026 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 11 Aug 2023 19:39:50 +0200
Subject: [PATCH 03/16] Release new version 0.20.5

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b41fde3..5e82dfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.20.5) grml-testing; urgency=medium
+
+  * [39d6dbd] Depend on util-linux-extra or older util-linux
+
+ -- Michael Prokop <mika@grml.org>  Fri, 11 Aug 2023 19:39:42 +0200
+
 grml-autoconfig (0.20.4) grml-testing; urgency=medium
 
   * [7bfc241] Drop support for bootlogd. Thanks to Roland Sommer for
-- 
2.1.4


From b39d89f0db161916b1acbda58f99604f6f2d724d Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 1 Sep 2023 13:57:49 +0200
Subject: [PATCH 04/16] Replace deprecated vmware-detect with virt-what/imvirt
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

As of git commit 0c1cd5d0cbee in grml-scripts we no longer ship our
vmware-detect binary, so instead rely on virt-what and imvirt.

Output of virt-what executed inside a VM on a VMware cluster is `vmware`
and `VMware ESX server` for imvirt.

Thanks: Christoph Biedl and András Korn for feedback
---
 autoconfig.functions | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/autoconfig.functions b/autoconfig.functions
index 891242e..af3a117 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -184,7 +184,8 @@ KVM=false
 VIRTUALBOX=false
 VMWARE=false
 
-if vmware-detect &>/dev/null; then
+if virt-what 2>/dev/null | grep -q 'vmware' || \
+  imvirt 2>/dev/null | grep -i "vmware" ; then
   VIRTUAL=true; VMWARE=true; VIRTUAL_ENV='VMware'
 fi
 
-- 
2.1.4


From 82176e8c295445a537a0a60fc7f50c21229af400 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 1 Sep 2023 14:04:52 +0200
Subject: [PATCH 05/16] imvirt/vmware: don't allow output of grep on stdout
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

To clarify, output of virt-what executed inside a VM on a VMware cluster
is `vmware`, and `VMware ESX Server` for imvirt.

Thanks: András Korn
---
 autoconfig.functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoconfig.functions b/autoconfig.functions
index af3a117..4a8b167 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -185,7 +185,7 @@ VIRTUALBOX=false
 VMWARE=false
 
 if virt-what 2>/dev/null | grep -q 'vmware' || \
-  imvirt 2>/dev/null | grep -i "vmware" ; then
+  imvirt 2>/dev/null | grep -iq "vmware" ; then
   VIRTUAL=true; VMWARE=true; VIRTUAL_ENV='VMware'
 fi
 
-- 
2.1.4


From bd414ee95f95b6c77d636aba947db0a16ab87618 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Wed, 6 Sep 2023 17:25:33 +0200
Subject: [PATCH 06/16] Release new version 0.20.6

---
 debian/changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5e82dfe..16d11fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-autoconfig (0.20.6) grml-testing; urgency=medium
+
+  * [b39d89f] Replace deprecated vmware-detect with virt-what/imvirt.
+    Thanks to Christoph Biedl and András Korn for feedback
+  * [82176e8] imvirt/vmware: don't allow output of grep on stdout.
+    Thanks to András Korn
+
+ -- Michael Prokop <mika@grml.org>  Wed, 06 Sep 2023 17:25:03 +0200
+
 grml-autoconfig (0.20.5) grml-testing; urgency=medium
 
   * [39d6dbd] Depend on util-linux-extra or older util-linux
-- 
2.1.4


From 74eef776a281bca6f6d6f089b065cb01dc600196 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 8 Sep 2023 08:32:21 +0200
Subject: [PATCH 07/16] config_cpu: use lscpu for identifying CPU information
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

On arm64 we don't have the CPU information in /proc/cpuinfo as expected
by our config_cpu, so its output is broken:

| # awk -F: '/^processor/{printf "        Processor"$2" is"};/^model name/{printf $2};/^vendor_id/{printf vendor};/^cpu MHz/{printf " %dMHz",int($2)};/^cache size/{printf ","$2" Cache"};/^$/{print ""}' /proc/cpuinfo
|         Processor 0 is
|         Processor 1 is
| [...]
|         Processor 13 is
|         Processor 14 is
|         Processor 15 is

FTR:

| # head /proc/cpuinfo
| processor       : 0
| BogoMIPS        : 50.00
| Features        : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm lrcpc dcpop asimddp ssbs
| CPU implementer : 0x41
| CPU architecture: 8
| CPU variant     : 0x3
| CPU part        : 0xd0c
| CPU revision    : 1
|
| processor       : 1

While with lspcu we get the information we're interested in:

| # lscpu | grep 'Model name:'
| Model name:                      Neoverse-N1
| BIOS Model name:                 virt-5.2  CPU @ 2.0GHz

So instead of having some hackish /proc/cpuinfo parsing, let's rely on
util-linux's lscpu(1).

While at it, let's output only the number of present CPUs instead of
listing every single one of them, given that there exist systems with
>100 CPUs nowadays. :)

Thanks: Christopher Bock and András Korn for feedback
---
 autoconfig.functions | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/autoconfig.functions b/autoconfig.functions
index 4a8b167..0da044d 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -905,19 +905,23 @@ fi # -z $INSTALLED
 
 # {{{ CPU-detection
 config_cpu(){
-if checkbootparam 'nocpu'; then
-  ewarn "Skipping CPU detection as requested on boot commandline." ; eend 0
-  return 0
-fi
+  if checkbootparam 'nocpu'; then
+    ewarn "Skipping CPU detection as requested on boot commandline." ; eend 0
+    return 0
+  fi
 
-if [[ $(grep -c processor /proc/cpuinfo) -gt 1 ]] ; then
-   einfo "Found CPU:"
-   CPU=$(awk -F: '/^processor/{printf "	Processor"$2" is"};/^model name/{printf $2};/^vendor_id/{printf vendor};/^cpu MHz/{printf " %dMHz",int($2)};/^cache size/{printf ","$2" Cache"};/^$/{print ""}' /proc/cpuinfo 2>>$DEBUG)
-   echo $CPU | sed 's/ \{1,\}/ /g'
-   eend 0
-else
-   einfo "Found CPU: `awk -F: '/^processor/{printf " Processor"$2" is"};/^model name/{printf $2};/^vendor_id/{printf vendor};/^cpu MHz/{printf " %dMHz",int($2)};/^cache size/{printf ","$2" Cache"};/^$/{print ""}' /proc/cpuinfo 2>>$DEBUG` " ; eend 0
-fi
+  if ! [ -x "$(which lscpu)" ] ; then
+    ewarn "Skipping CPU detection due to lack of lscpu."; eend 0
+    return 0
+  fi
+
+  local cpu_info num_cpus
+
+  cpu_info="$(lscpu | sed -n '/^Model name:/s/[^:]*:\s*//p')"
+  num_cpus=$(grep -c processor /proc/cpuinfo)
+
+  einfo "Found ${num_cpus} CPU(s): ${cpu_info}"
+  eend 0
 }
 # }}}
 
-- 
2.1.4


From 1a7c49a326167efa857546f37b551ea3924f5654 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 8 Sep 2023 08:55:59 +0200
Subject: [PATCH 08/16] Release new version 0.20.7

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 16d11fe..e1e8f64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.20.7) grml-testing; urgency=medium
+
+  * [74eef77] config_cpu: use lscpu for identifying CPU information.
+    Thanks to Christopher Bock and András Korn for feedback
+
+ -- Michael Prokop <mika@grml.org>  Fri, 08 Sep 2023 08:55:38 +0200
+
 grml-autoconfig (0.20.6) grml-testing; urgency=medium
 
   * [b39d89f] Replace deprecated vmware-detect with virt-what/imvirt.
-- 
2.1.4


From 60157801aae38ff3348715f7a68d0e5ba6bfc2ba Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Thu, 14 Sep 2023 17:00:44 +0200
Subject: [PATCH 09/16] Implement easter egg for 20 years of grml.org

% whois grml.org | grep 'Creation Date'
Creation Date: 2003-09-16T13:09:06Z

Thanks: Christopher Bock for suggesting usage of lolcat
---
 autoconfig           |  1 +
 autoconfig.functions | 27 +++++++++++++++++++++++++++
 grml-autoconfig      |  2 ++
 3 files changed, 30 insertions(+)

diff --git a/autoconfig b/autoconfig
index b98e4ca..711deaa 100644
--- a/autoconfig
+++ b/autoconfig
@@ -58,6 +58,7 @@ CONFIG_DEBS='yes'             # check for bootoption debs for installing .debs
 CONFIG_DISPLAY_SSH_FINGERPRINTS='yes' # display SSH server key fingerprints
 CONFIG_DISTRI='yes'           # support some customization via bootoption distri
 CONFIG_DMRAID='yes'           # support for dmraid
+CONFIG_EASTEREGG='yes'        # easteregg
 CONFIG_EXTRACT='yes'          # specify which (only in combination with bootparam myconfig/netconfig useful)
 CONFIG_FINDDCSDIR='yes'       # search for a debs, config, scripts directory
 CONFIG_HOMEDIR='yes'          # check for persistent homedir option
diff --git a/autoconfig.functions b/autoconfig.functions
index 0da044d..b7d694c 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1992,5 +1992,32 @@ fi
 }
 # }}}
 
+# {{{ Easteregg (for 20 years grml.org)
+config_easteregg() {
+  current_date=$(date +%Y-%m-%d)
+  birthday="2023-09-16"
+  one_month_later=$(date -d "${current_date} + 1 month" +%Y-%m-%d)
+
+  einfo "You found the birthday easter egg!" ; eend 0
+
+  # nothing to be done if it's more than one month since $birthday
+  if ! [[ "${current_date}" == "${birthday}" || "${current_date}" == "${one_month_later}" ]]; then
+    return 0
+  fi
+
+  if [[ -x /bin/toilet && -x /usr/games/lolcat ]] ; then
+    visualize() { printf "%s\n" "$*" | toilet | /usr/games/lolcat ; }
+  elif [[ -x /bin/toilet ]] ; then
+    visualize() { printf "%s\n" "$*" | toilet ; }
+  else
+    visualize() { printf "%s\n" "$*" ; }
+  fi
+
+  visualize "   \o/   "
+  visualize "20 years"
+  visualize "grml.org"
+}
+# }}}
+
 ## END OF FILE #################################################################
 # vim:foldmethod=marker expandtab ai ft=zsh shiftwidth=2
diff --git a/grml-autoconfig b/grml-autoconfig
index 6e71b4d..f341de6 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -146,6 +146,8 @@ checkvalue $CONFIG_BLANKING && config_blanking
 checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
 
 checkvalue $CONFIG_XSTARTUP && config_x_startup
+
+checkvalue $CONFIG_EASTEREGG && config_easteregg
 # }}}
 
 # {{{ Re-enable signals
-- 
2.1.4


From 2b0f0ee95d9c4e179b94d1d5333e683665e082a6 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Thu, 14 Sep 2023 18:25:44 +0200
Subject: [PATCH 10/16] Release new version 0.21.0

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e1e8f64..7daaa17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.21.0) grml-testing; urgency=medium
+
+  * [6015780] Implement easter egg for 20 years of grml.org.
+    Thanks to Christopher Bock for suggesting usage of lolcat
+
+ -- Michael Prokop <mika@grml.org>  Thu, 14 Sep 2023 18:24:38 +0200
+
 grml-autoconfig (0.20.7) grml-testing; urgency=medium
 
   * [74eef77] config_cpu: use lscpu for identifying CPU information.
-- 
2.1.4


From 4e06a5ed225c72954f03d12c07aa8bc33fbcd78f Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Sat, 16 Sep 2023 12:19:23 +0200
Subject: [PATCH 11/16] Improve easter egg for 20 years of grml.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Relevant changes:

1) Don't convert dates via date(1), but provide epoch seconds right away
2) Also use zsh's ${EPOCHSECONDS} instead of forking to date(1)
3) Display easter egg message with einfo iff we are within the birthday range
4) Don't display easter egg only on 2023-09-16 and one month later,
   but instead have the easter egg appear randomly, with diminishing probability as
   you get farther from the actual birthday
5) Don't display anything at all when booting with noeasteregg boot option

Thanks: Christopher Bock and András Korn
---
 autoconfig.functions | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/autoconfig.functions b/autoconfig.functions
index b7d694c..254129b 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1993,18 +1993,9 @@ fi
 # }}}
 
 # {{{ Easteregg (for 20 years grml.org)
-config_easteregg() {
-  current_date=$(date +%Y-%m-%d)
-  birthday="2023-09-16"
-  one_month_later=$(date -d "${current_date} + 1 month" +%Y-%m-%d)
-
+display_easteregg() {
   einfo "You found the birthday easter egg!" ; eend 0
 
-  # nothing to be done if it's more than one month since $birthday
-  if ! [[ "${current_date}" == "${birthday}" || "${current_date}" == "${one_month_later}" ]]; then
-    return 0
-  fi
-
   if [[ -x /bin/toilet && -x /usr/games/lolcat ]] ; then
     visualize() { printf "%s\n" "$*" | toilet | /usr/games/lolcat ; }
   elif [[ -x /bin/toilet ]] ; then
@@ -2017,6 +2008,26 @@ config_easteregg() {
   visualize "20 years"
   visualize "grml.org"
 }
+
+config_easteregg() {
+  checkbootparam 'noeasteregg' && return 0
+
+  zmodload zsh/datetime 2>/dev/null || return 0
+  zmodload zsh/mathfunc 2>/dev/null || return 0
+
+  local birthday=1694822400            # := 2023-09-16 -> TZ=UTC date -d "2023-09-16" +%s
+  local one_month=$[24*30*3600]
+  local pi=3.14159265358979323846
+  local magic=$(( one_month/(pi/2) ))  # normalization factor, used to map the [birthday;birthday+-one_month] range onto [0;+-pi/2]
+
+  if [[ $(( abs(birthday-EPOCHSECONDS) )) -le $one_month ]] ; then
+    if [[ $(( rand48() )) -le $(( cos((birthday-EPOCHSECONDS)/magic) )) ]] ; then
+      display_easteregg
+    fi
+  fi
+
+  return 0
+}
 # }}}
 
 ## END OF FILE #################################################################
-- 
2.1.4


From 541958eb286e3ede2909413e586c7b64c0fdf565 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Sat, 16 Sep 2023 14:44:09 +0200
Subject: [PATCH 12/16] Release new version 0.21.1

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7daaa17..a4e572a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.21.1) grml-testing; urgency=medium
+
+  * [4e06a5e] Improve easter egg for 20 years of grml.org.
+    Thanks to Christopher Bock and András Korn
+
+ -- Michael Prokop <mika@grml.org>  Sat, 16 Sep 2023 14:44:00 +0200
+
 grml-autoconfig (0.21.0) grml-testing; urgency=medium
 
   * [6015780] Implement easter egg for 20 years of grml.org.
-- 
2.1.4


From deb3d70e647ada382f2a82d7d9ff77ebb3f5772b Mon Sep 17 00:00:00 2001
From: Csillag Tamas <cstamas@digitus.itk.ppke.hu>
Date: Wed, 4 Oct 2023 14:55:22 +0200
Subject: [PATCH 13/16] if multiple mountpoints avail, pick the first one

---
 autoconfig.functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoconfig.functions b/autoconfig.functions
index 254129b..228a561 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1412,7 +1412,7 @@ else
     else
       eindent
       einfo "debs, config, scripts are read from $DCSDEVICE." ; eend 0
-      DCSDIR="$(< /proc/mounts awk -v DCSDEV=$DCSDEVICE '{if ($1 == DCSDEV) { print $2 }}')"
+      DCSDIR="$(< /proc/mounts awk -v DCSDEV=$DCSDEVICE '{if ($1 == DCSDEV) { print $2; exit }}')"
       if [ -n "$DCSDIR" ]; then
         ewarn "$DCSDEVICE already mounted on $DCSDIR"; eend 0
       else
-- 
2.1.4


From 8ebac713cab7fbebafe10a8faaf929cfe6cba61b Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Wed, 4 Oct 2023 19:00:08 +0200
Subject: [PATCH 14/16] Release new version 0.21.2

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a4e572a..4a7cffa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.21.2) grml-testing; urgency=medium
+
+  [ Csillag Tamas ]
+  * [deb3d70] if multiple mountpoints avail, pick the first one
+
+ -- Michael Prokop <mika@grml.org>  Wed, 04 Oct 2023 18:59:59 +0200
+
 grml-autoconfig (0.21.1) grml-testing; urgency=medium
 
   * [4e06a5e] Improve easter egg for 20 years of grml.org.
-- 
2.1.4


From ce26c0405c7da364821860c2801d74eb9d3fb8e7 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 2 Feb 2024 16:32:40 +0100
Subject: [PATCH 15/16] Drop support for dmraid

dmraid is obsolete and isn't available with Debian trixie (current
testing) and newer anymore. See https://bugs.debian.org/1056944,
https://bugs.debian.org/864423 and https://bugs.debian.org/1034188 for
details.
---
 autoconfig           |  1 -
 autoconfig.functions | 69 ----------------------------------------------------
 grml-autoconfig      |  2 --
 3 files changed, 72 deletions(-)

diff --git a/autoconfig b/autoconfig
index 711deaa..7846e8b 100644
--- a/autoconfig
+++ b/autoconfig
@@ -57,7 +57,6 @@ CONFIG_DEBNET='yes'           # search for /etc/network/interfaces on partitions
 CONFIG_DEBS='yes'             # check for bootoption debs for installing .debs
 CONFIG_DISPLAY_SSH_FINGERPRINTS='yes' # display SSH server key fingerprints
 CONFIG_DISTRI='yes'           # support some customization via bootoption distri
-CONFIG_DMRAID='yes'           # support for dmraid
 CONFIG_EASTEREGG='yes'        # easteregg
 CONFIG_EXTRACT='yes'          # specify which (only in combination with bootparam myconfig/netconfig useful)
 CONFIG_FINDDCSDIR='yes'       # search for a debs, config, scripts directory
diff --git a/autoconfig.functions b/autoconfig.functions
index 228a561..3bab753 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1633,75 +1633,6 @@ config_swraid(){
 }
 # }}}
 
-# {{{ dmraid
-config_dmraid(){
-  [ -n "$INSTALLED" ] && return 0
-
-  if checkbootparam 'nodmraid' ; then
-    ewarn "Skipping dmraid code as requested on boot commandline." ; eend 0
-    return 0
-  fi
-
-  if ! [ -x /sbin/dmraid ] ; then
-    ewarn "dmraid not available, can not execute it." ; eend 1
-    return
-  fi
-
-  dmraid_wrapper() {
-    # usage: dmraid_wrapper <dmraid_option>
-    [ -n "$1" ] || return 1
-
-    IFSOLD=${IFS:-}
-    IFS=$'\n'
-    eindent
-
-    for line in $(dmraid $1 ; echo errcode:$?); do
-      case $line in
-        *'no block devices found'*)
-          einfo "No block devices found" ; eend 0
-          break
-          ;;
-        *'no raid disks'*)
-          einfo "No active dmraid devices found" ; eend 0
-          break
-          ;;
-        errcode:0)
-          eend 0;
-          ;;
-        errcode:1)
-          eend 1
-          ;;
-        *)
-          einfo "$line"
-          ;;
-      esac
-    done
-
-    eoutdent
-    IFS=$IFSOLD
-  }
-
-  if checkbootparam 'dmraid' ; then
-    local ACTION="$(getbootparam 'dmraid' 2>>$DEBUG)"
-    if [ "$ACTION" = "off" ] ; then
-      # Deactivates all active software RAID sets:
-      einfo "Deactivating present dmraid sets (as requested via dmraid=off):"
-      dmraid_wrapper -an
-    else
-      # Activate all software RAID sets discovered:
-      einfo "Activating present dmraid sets (as requested via dmraid):"
-      dmraid_wrapper -ay
-    fi
-
-    return
-  fi
-
-  # by default (no special bootoptions) discover all software RAID devices:
-  einfo "Searching for any present dmraid sets:"
-  dmraid_wrapper -r
-}
-# }}}
-
 # {{{ LVM (Logical Volumes)
 config_lvm(){
   [ -n "$INSTALLED" ] && return 0
diff --git a/grml-autoconfig b/grml-autoconfig
index f341de6..dedb9a8 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -83,8 +83,6 @@ checkvalue $CONFIG_TIMEZONE && config_timezone
 
 checkvalue $CONFIG_SWRAID && config_swraid
 
-checkvalue $CONFIG_DMRAID && config_dmraid
-
 checkvalue $CONFIG_LVM && config_lvm
 
 checkvalue $CONFIG_TESTCD && config_testcd
-- 
2.1.4


From d894a7e15ae5736fb7b11f0d35044458886cff1a Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 2 Feb 2024 16:49:46 +0100
Subject: [PATCH 16/16] Release new version 0.22.0

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4a7cffa..2b9ae55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.22.0) grml-testing; urgency=medium
+
+  * [ce26c04] Drop support for dmraid
+
+ -- Michael Prokop <mika@grml.org>  Fri, 02 Feb 2024 16:49:33 +0100
+
 grml-autoconfig (0.21.2) grml-testing; urgency=medium
 
   [ Csillag Tamas ]
-- 
2.1.4