From 65ea2edfabd4dc5cfe92ad64eb55939981eff21d Mon Sep 17 00:00:00 2001
From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
Date: Mon, 16 Jan 2023 07:20:12 +0100
Subject: [PATCH] hooks/no-merged-usr/essential00.sh: symlink to
 ../merged-usr/essential00.sh

Both hooks need to install the real usr-is-merged package after having
installed a dummy in the setup hook even if it's for different reasons.
---
 hooks/no-merged-usr/essential00.sh | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)
 mode change 100755 => 120000 hooks/no-merged-usr/essential00.sh

diff --git a/hooks/no-merged-usr/essential00.sh b/hooks/no-merged-usr/essential00.sh
deleted file mode 100755
index fac6928..0000000
--- a/hooks/no-merged-usr/essential00.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-if [ "${MMDEBSTRAP_VERBOSITY:-1}" -ge 3 ]; then
-        set -x
-fi
-
-TARGET="$1"
-
-APT_CONFIG=$MMDEBSTRAP_APT_CONFIG apt-get --yes install -oDPkg::Chroot-Directory="$TARGET" usr-is-merged
-
-chroot "$TARGET" dpkg-query --showformat '${db:Status-Status}\n' --show usr-is-merged | grep -q '^installed$'
-chroot "$TARGET" dpkg-query --showformat '${Source}\n' --show usr-is-merged | grep -q '^usrmerge$'
-dpkg --compare-versions "1" "lt" "$(chroot "$TARGET" dpkg-query --showformat '${Version}\n' --show usr-is-merged)"
diff --git a/hooks/no-merged-usr/essential00.sh b/hooks/no-merged-usr/essential00.sh
new file mode 120000
index 0000000..5360c8f
--- /dev/null
+++ b/hooks/no-merged-usr/essential00.sh
@@ -0,0 +1 @@
+../merged-usr/essential00.sh
\ No newline at end of file