From 84f80673f40a92b9b5d6c3b5274f25e755b7ff22 Mon Sep 17 00:00:00 2001
From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
Date: Wed, 15 May 2024 00:23:56 +0200
Subject: [PATCH] Revert "attempt diagnosing skip-tar-in-mknod failure 'file
 changed as we read it' using auditd"

This reverts commit 726fc38d1d9e7771e3fbacc218154bc08b364da9.
---
 coverage.txt            | 2 +-
 make_mirror.sh          | 1 -
 tests/skip-tar-in-mknod | 5 ++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/coverage.txt b/coverage.txt
index dde5b33..c040b8b 100644
--- a/coverage.txt
+++ b/coverage.txt
@@ -433,4 +433,4 @@ Test: skip-output-mknod
 Modes: root unshare
 
 Test: skip-tar-in-mknod
-Modes: root
+Modes: unshare
diff --git a/make_mirror.sh b/make_mirror.sh
index 3f8aae4..442b3ce 100755
--- a/make_mirror.sh
+++ b/make_mirror.sh
@@ -457,7 +457,6 @@ if [ "$HAVE_QEMU" = "yes" ]; then
 	if [ ! -e ./mmdebstrap ]; then
 		pkgs="$pkgs,mmdebstrap"
 	fi
-	pkgs="$pkgs,auditd"
 	arches=$HOSTARCH
 	if [ "$RUN_MA_SAME_TESTS" = "yes" ]; then
 		case "$HOSTARCH" in
diff --git a/tests/skip-tar-in-mknod b/tests/skip-tar-in-mknod
index cc18977..eb3027a 100644
--- a/tests/skip-tar-in-mknod
+++ b/tests/skip-tar-in-mknod
@@ -3,7 +3,7 @@ set -eu
 export LC_ALL=C.UTF-8
 export SOURCE_DATE_EPOCH={{ SOURCE_DATE_EPOCH }}
 
-#[ {{ MODE }} = "unshare" ]
+[ {{ MODE }} = "unshare" ]
 
 trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
 
@@ -22,8 +22,7 @@ fi
 $prefix {{ CMD }} --mode={{ MODE }} --variant=custom \
 	--skip=update,setup,cleanup,tar-in/mknod \
 	--setup-hook='tar-in ./cache/mmdebstrap-{{ DIST }}-apt.tar /' \
-	--setup-hook='/sbin/auditctl -w "$1" -p wxa -k mykey' \
-	'' /tmp/debian-chroot.tar || /sbin/ausearch --format text -k mykey
+	'' /tmp/debian-chroot.tar
 
 cmp ./cache/mmdebstrap-{{ DIST }}-apt.tar /tmp/debian-chroot.tar \
 	|| diffoscope ./cache/mmdebstrap-{{ DIST }}-apt.tar /tmp/debian-chroot.tar
-- 
2.39.2