From 4998e27cc77d5ca7b22a8af38ab9bcceded0e08a Mon Sep 17 00:00:00 2001 From: Caleb Connolly Date: Mon, 30 Sep 2024 12:38:02 +0200 Subject: [PATCH] chroot: force disable /usr merge (MR 2418) We plan to ship systemd with split /usr until the /usr merge is complete in Alpine. Let's not drop all our code yet but just forcefully disable it. Signed-off-by: Caleb Connolly --- pmb/chroot/init.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pmb/chroot/init.py b/pmb/chroot/init.py index b5df9973..32b825ce 100644 --- a/pmb/chroot/init.py +++ b/pmb/chroot/init.py @@ -117,6 +117,11 @@ def init(chroot: Chroot, usr_merge=UsrMerge.AUTO): # When already initialized: just prepare the chroot arch = chroot.arch + # We plan to ship systemd with split /usr until the /usr merge is complete + # in Alpine. Let's not drop all our code yet but just forcefully disable + # it. + usr_merge = UsrMerge.OFF + config = get_context().config # If the channel is wrong and the user has auto_zap_misconfigured_chroots