Merge branch 'usr-merge' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master

This commit is contained in:
Dimitri John Ledkov 2021-05-05 11:38:55 +01:00
commit b194e57eff
No known key found for this signature in database
GPG Key ID: 9B8EC849D5EF70ED

View File

@ -1257,11 +1257,6 @@ esac
case $SUBPROJECT in
buildd)
cp -af /usr/share/livecd-rootfs/live-build/buildd/* config/
# Disable merged /usr to avoid building packages with
# hardcoded paths that assume it.
echo 'DEBOOTSTRAP_OPTIONS="$DEBOOTSTRAP_OPTIONS --no-merged-usr"' \
>> config/common
;;
esac