Skip to content

Commit

Permalink
No longer bootstrap with --no-merged-usr
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mika committed Apr 25, 2023
1 parent 3152440 commit bac3076
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion grml-live
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bac3076

Please sign in to comment.