From: Michael Prokop <mika@grml.org>
Date: Wed, 3 Jun 2020 14:14:39 +0000 (+0200)
Subject: Use debootstrap with --no-merged-usr by default
X-Git-Tag: v0.35.3~2
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=397c7e74e4587e553db7b7457d723069a5e3c302

Use debootstrap with --no-merged-usr by default

By default debootstrap creates systems with /usr being merged, leading
to issues like the xfsdump issue we saw in
https://github.com/grml/grml-live/issues/85, also dpkg -S ... and
further commands break with /usr being merged.

It's possible to generate custom basefiles with debootstrap, but by
default we should invoke debootstrap with the --no-merged-usr option,
otherwise we might have different ISO layouts, depending on whether we
use appropriate basefiles (as on our offical build host) vs. locally.

Closes: grml/grml-live#86
---

diff --git a/grml-live b/grml-live
index daa4da9..ce6cb35 100755
--- a/grml-live
+++ b/grml-live
@@ -678,7 +678,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"
+  FAI_DEBOOTSTRAP_OPTS="--exclude=info,tasksel,tasksel-data --include=aptitude --arch $ARCH --no-merged-usr"
 fi
 
 # create backup of old (not yet automatically generated) config file