Makefile.builder

@@ -16,5 +16,6 @@ source-debian-quilt-copy-in:
 		sed -i /initscripts/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
 	fi
 	-$(shell $(ORIG_SRC)/debian-quilt $(ORIG_SRC)/series-debian-vm.conf $(CHROOT_DIR)/$(DIST_SRC)/debian/patches)
+	tar cfz $(ORIG_FILE) --exclude-vcs --exclude=rpm --exclude=pkgs --exclude=deb --exclude=debian -C $(CHROOT_DIR)/$(DIST_SRC) .
 
 # vim: filetype=make

network/vif-route-qubes

@@ -25,12 +25,7 @@ dir=$(dirname "$0")
 . "$dir/vif-common.sh"
 
 #main_ip=$(dom0_ip)
-
+lockfile=/var/run/xen-hotplug/vif-lock
-ipt_arg=
-if "iptables-restore" --help 2>&1 | grep -q wait=; then
-    # 'wait' must be last on command line if secs not specified
-    ipt_arg=--wait
-fi
 
 # shellcheck disable=SC2154
 if [ "${ip}" ]; then
@@ -105,13 +100,13 @@ if [ "${ip}" ] ; then
         else
             ipt=iptables-restore
         fi
-        echo -e "*raw\\n$iptables_cmd -i ${vif} ! -s ${addr} -j DROP\\nCOMMIT" | \
+        echo -e "*raw\n$iptables_cmd -i ${vif} ! -s ${addr} -j DROP\nCOMMIT" | \
-            ${cmdprefix} $ipt --noflush $ipt_arg
+            ${cmdprefix} flock $lockfile $ipt --noflush
 	done
     # if no IPv6 is assigned, block all IPv6 traffic on that interface
     if ! [[ "$ip" = *:* ]]; then
-        echo -e "*raw\\n$iptables_cmd -i ${vif} -j DROP\\nCOMMIT" | \
+        echo -e "*raw\n$iptables_cmd -i ${vif} -j DROP\nCOMMIT" | \
-            ${cmdprefix} ip6tables-restore --noflush $ipt_arg
+            ${cmdprefix} flock $lockfile ip6tables-restore --noflush
     fi
     ${cmdprefix} ip addr "${ipcmd}" "${back_ip}/32" dev "${vif}"
     if [ "${back_ip6}" ] && [[ "${back_ip6}" != "fe80:"* ]]; then