From aaac3e677f5ec10ce3cfa7a7fa80032ef7be1880 Mon Sep 17 00:00:00 2001
From: Johannes 'josch' Schauer <josch@mister-muffin.de>
Date: Sat, 4 Jan 2020 09:19:19 +0100
Subject: [PATCH] make_mirror.sh: feed file to guestfish via heredoc instead of
 tempfile

---
 make_mirror.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/make_mirror.sh b/make_mirror.sh
index 28024f8..9831afb 100755
--- a/make_mirror.sh
+++ b/make_mirror.sh
@@ -399,15 +399,12 @@ done
 
 if [ "$HAVE_QEMU" = "yes" ]; then
 	# now replace the minihttpd config with one that serves the new repository
-	# create a temporary directory because "copy-in" cannot rename the file
-	tmpdir="$(mktemp -d)"
-	cat << END > "$tmpdir/mini-httpd"
+	guestfish -a "$newcachedir/debian-$DEFAULT_DIST.qcow" -i <<EOF
+upload -<<END /etc/default/mini-httpd
 START=1
 DAEMON_OPTS="-h 127.0.0.1 -p 80 -u nobody -dd /mnt/cache -i /var/run/mini-httpd.pid -T UTF-8"
 END
-	guestfish -a "$newcachedir/debian-$DEFAULT_DIST.qcow" -i copy-in "$tmpdir/mini-httpd" /etc/default
-	rm "$tmpdir/mini-httpd"
-	rmdir "$tmpdir"
+EOF
 fi
 
 # delete possibly leftover symlink