|
@@ -23,8 +23,8 @@ while true; do
|
|
|
TRIGGER=reload
|
|
|
else
|
|
|
# Wait for changes in xenstore file
|
|
|
- /usr/bin/xenstore-watch-qubes $XENSTORE_IPTABLES
|
|
|
- TRIGGER=$(/usr/bin/xenstore-read $XENSTORE_IPTABLES)
|
|
|
+ xenstore-watch-qubes $XENSTORE_IPTABLES
|
|
|
+ TRIGGER=$(xenstore-read $XENSTORE_IPTABLES)
|
|
|
fi
|
|
|
|
|
|
if ! [ "$TRIGGER" = "reload" ]; then continue ; fi
|
|
@@ -34,19 +34,19 @@ while true; do
|
|
|
# during the time when the rules are being (re)applied
|
|
|
echo "0" > /proc/sys/net/ipv4/ip_forward
|
|
|
|
|
|
- RULES=$(/usr/bin/xenstore-read $XENSTORE_IPTABLES_HEADER)
|
|
|
- IPTABLES_SAVE=$(/sbin/iptables-save | sed '/^\*filter/,/^COMMIT/d')
|
|
|
- OUT=`echo -e "$RULES\n$IPTABLES_SAVE" | /sbin/iptables-restore 2>&1 || true`
|
|
|
+ RULES=$(xenstore-read $XENSTORE_IPTABLES_HEADER)
|
|
|
+ IPTABLES_SAVE=$(iptables-save | sed '/^\*filter/,/^COMMIT/d')
|
|
|
+ OUT=`echo -e "$RULES\n$IPTABLES_SAVE" | iptables-restore 2>&1 || true`
|
|
|
|
|
|
for i in $(xenstore-list qubes-iptables-domainrules) ; do
|
|
|
- RULES=$(/usr/bin/xenstore-read qubes-iptables-domainrules/"$i")
|
|
|
- ERRS=`echo -e "$RULES" | /sbin/iptables-restore -n 2>&1 || true`
|
|
|
+ RULES=$(xenstore-read qubes-iptables-domainrules/"$i")
|
|
|
+ ERRS=`echo -e "$RULES" | iptables-restore -n 2>&1 || true`
|
|
|
echo "Failed applying rules for $i: $ERRS" >&2
|
|
|
OUT="$OUT$ERRS"
|
|
|
done
|
|
|
- /usr/bin/xenstore-write $XENSTORE_ERROR "$OUT"
|
|
|
+ xenstore-write $XENSTORE_ERROR "$OUT"
|
|
|
if [ "$OUT" ]; then
|
|
|
- DISPLAY=:0 /usr/bin/notify-send -t 3000 "Firewall loading error ($HOSTNAME)" "$OUT" || :
|
|
|
+ DISPLAY=:0 notify-send -t 3000 "Firewall loading error ($HOSTNAME)" "$OUT" || :
|
|
|
fi
|
|
|
|
|
|
# Check if user didn't define some custom rules to be applied as well...
|