From: Michael Prokop <mika@grml.org>
Date: Tue, 25 Apr 2023 15:21:28 +0000 (+0200)
Subject: No longer bootstrap with --no-merged-usr
X-Git-Tag: v0.44.0~3
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=bac307629479296e8bb5bf3f56bd02b1a7108990

No longer bootstrap with --no-merged-usr

The transition to usrmerge was done in Debian, see
https://lists.debian.org/debian-devel-announce/2022/09/msg00001.html
Debian/bookworm AKA v12 will only support the merged-/usr layout.

Systemd is also dropping support for unmerged-usr systems (see
https://lists.freedesktop.org/archives/systemd-devel/2022-September/048352.html).

Also debootstrap complains about this nowadays:

| W: Upgrading non-merged-/usr environments post-bookworm is unsupported. Only do this for CI/QA infrastructure that will be re-bootstrapped rather than upgraded.

So no longer enable --no-merged-usr by default, if anyone should
still need it, it can be set via custom $FAI_DEBOOTSTRAP_OPTS.

Thanks: Csillag Tamas for reporting
---

diff --git a/grml-live b/grml-live
index 6710037..65c9417 100755
--- a/grml-live
+++ b/grml-live
@@ -712,7 +712,7 @@ if [ -z "$FAI_DEBOOTSTRAP" ] ; then
 fi
 
 if [ -z "$FAI_DEBOOTSTRAP_OPTS" ] ; then
-  FAI_DEBOOTSTRAP_OPTS="--exclude=info,tasksel,tasksel-data --include=aptitude --arch $ARCH --no-merged-usr"
+  FAI_DEBOOTSTRAP_OPTS="--exclude=info,tasksel,tasksel-data --include=aptitude --arch $ARCH"
 fi
 
 # create backup of old (not yet automatically generated) config file