hooks/merged-usr: workaround not necessary anymore since debootstrap 1.0.125

This commit is contained in:
Johannes Schauer Marin Rodrigues 2022-05-26 07:33:50 +02:00
parent 790294ddca
commit a238d90774
Signed by untrusted user: josch
GPG key ID: F2CBA5C78FBD83E1

View file

@ -54,8 +54,6 @@ if [ -e /usr/share/debootstrap/functions ]; then
. /usr/share/debootstrap/functions . /usr/share/debootstrap/functions
doing_variant () { [ $1 != "buildd" ]; } doing_variant () { [ $1 != "buildd" ]; }
MERGED_USR="yes" MERGED_USR="yes"
# until https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/48 gets merged
link_dir=""
setup_merged_usr setup_merged_usr
else else
link_dir="" link_dir=""