From a238d90774505e8c6e408803cc266c0251ab2113 Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Thu, 26 May 2022 07:33:50 +0200 Subject: [PATCH] hooks/merged-usr: workaround not necessary anymore since debootstrap 1.0.125 --- hooks/merged-usr/setup00.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/hooks/merged-usr/setup00.sh b/hooks/merged-usr/setup00.sh index 3a2af74..d37ff3f 100755 --- a/hooks/merged-usr/setup00.sh +++ b/hooks/merged-usr/setup00.sh @@ -54,8 +54,6 @@ if [ -e /usr/share/debootstrap/functions ]; then . /usr/share/debootstrap/functions doing_variant () { [ $1 != "buildd" ]; } MERGED_USR="yes" - # until https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/48 gets merged - link_dir="" setup_merged_usr else link_dir=""