From f9c7394c2f194b83b44add151bb85aa332a7719f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 10 Nov 2015 16:39:22 +0100
Subject: [PATCH] updates-proxy-setup: use temporary file for config snippet

Don't use ${CONF_PATH}.qubes, because it may override some existing
file, and is racy approach (even if not against user, but another script
instance).

QubesOS/qubes-issues#1282
---
 network/update-proxy-configs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/network/update-proxy-configs b/network/update-proxy-configs
index 7a0afd7..6480c58 100755
--- a/network/update-proxy-configs
+++ b/network/update-proxy-configs
@@ -50,7 +50,8 @@ update_conf() {
     fi
 
     # Prepare config block
-    cat > ${CONF_PATH}.qubes <<EOF
+    local tmpfile=`mktemp`
+    cat > ${tmpfile} <<EOF
 # This part of configuration, until QUBES END, is automatically generated by
 # $0. All changes here will be overriden.
 # If you want to override any option set here, set it again to desired value,
@@ -62,8 +63,9 @@ EOF
     sed -i -e "/^$BEGIN_MARKER$/,/^$END_MARKER$/{
         /^$END_MARKER$/b
         /^$BEGIN_MARKER$/!d
-        r ${CONF_PATH}.qubes
+        r ${tmpfile}
         }" ${CONF_PATH}
+    rm -f ${tmpfile}
 }
 
 ### helper functions end