Mirror/pmbootstrap
1
0
Fork 1
mirror of https://gitlab.postmarketos.org/postmarketOS/pmbootstrap.git synced 2025-07-14 20:09:49 +03:00
Code Issues Wiki Activity

chroot: force disable /usr merge (MR 2418)

Browse source 
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 <caleb@postmarketos.org>
This commit is contained in:
Caleb Connolly 2024-09-30 12:38:02 +02:00
parent 742300b090
commit 4998e27cc7
No known key found for this signature in database
GPG key ID: 0583312B195F64B6
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pmb/chroot/init.py
View file

@ -117,6 +117,11 @@ def init(chroot: Chroot, usr_merge=UsrMerge.AUTO):
# When already initialized: just prepare the chroot # When already initialized: just prepare the chroot
arch = chroot.arch 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 config = get_context().config
# If the channel is wrong and the user has auto_zap_misconfigured_chroots # If the channel is wrong and the user has auto_zap_misconfigured_chroots