forked from josch/mmdebstrap
Revert "attempt diagnosing skip-tar-in-mknod failure 'file changed as we read it' using auditd"
This reverts commit 726fc38d1d
.
This commit is contained in:
parent
e3eafd0009
commit
84f80673f4
3 changed files with 3 additions and 5 deletions
|
@ -433,4 +433,4 @@ Test: skip-output-mknod
|
||||||
Modes: root unshare
|
Modes: root unshare
|
||||||
|
|
||||||
Test: skip-tar-in-mknod
|
Test: skip-tar-in-mknod
|
||||||
Modes: root
|
Modes: unshare
|
||||||
|
|
|
@ -457,7 +457,6 @@ if [ "$HAVE_QEMU" = "yes" ]; then
|
||||||
if [ ! -e ./mmdebstrap ]; then
|
if [ ! -e ./mmdebstrap ]; then
|
||||||
pkgs="$pkgs,mmdebstrap"
|
pkgs="$pkgs,mmdebstrap"
|
||||||
fi
|
fi
|
||||||
pkgs="$pkgs,auditd"
|
|
||||||
arches=$HOSTARCH
|
arches=$HOSTARCH
|
||||||
if [ "$RUN_MA_SAME_TESTS" = "yes" ]; then
|
if [ "$RUN_MA_SAME_TESTS" = "yes" ]; then
|
||||||
case "$HOSTARCH" in
|
case "$HOSTARCH" in
|
||||||
|
|
|
@ -3,7 +3,7 @@ set -eu
|
||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
export SOURCE_DATE_EPOCH={{ SOURCE_DATE_EPOCH }}
|
export SOURCE_DATE_EPOCH={{ SOURCE_DATE_EPOCH }}
|
||||||
|
|
||||||
#[ {{ MODE }} = "unshare" ]
|
[ {{ MODE }} = "unshare" ]
|
||||||
|
|
||||||
trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
|
trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
|
||||||
|
|
||||||
|
@ -22,8 +22,7 @@ fi
|
||||||
$prefix {{ CMD }} --mode={{ MODE }} --variant=custom \
|
$prefix {{ CMD }} --mode={{ MODE }} --variant=custom \
|
||||||
--skip=update,setup,cleanup,tar-in/mknod \
|
--skip=update,setup,cleanup,tar-in/mknod \
|
||||||
--setup-hook='tar-in ./cache/mmdebstrap-{{ DIST }}-apt.tar /' \
|
--setup-hook='tar-in ./cache/mmdebstrap-{{ DIST }}-apt.tar /' \
|
||||||
--setup-hook='/sbin/auditctl -w "$1" -p wxa -k mykey' \
|
'' /tmp/debian-chroot.tar
|
||||||
'' /tmp/debian-chroot.tar || /sbin/ausearch --format text -k mykey
|
|
||||||
|
|
||||||
cmp ./cache/mmdebstrap-{{ DIST }}-apt.tar /tmp/debian-chroot.tar \
|
cmp ./cache/mmdebstrap-{{ DIST }}-apt.tar /tmp/debian-chroot.tar \
|
||||||
|| diffoscope ./cache/mmdebstrap-{{ DIST }}-apt.tar /tmp/debian-chroot.tar
|
|| diffoscope ./cache/mmdebstrap-{{ DIST }}-apt.tar /tmp/debian-chroot.tar
|
||||||
|
|
Loading…
Reference in a new issue