aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Kaspar [Dee'Kej] <dkaspar@redhat.com>2018-06-06 19:19:11 +0200
committerDee'Kej <deekej@linuxmail.org>2018-06-07 14:04:50 +0200
commit12a83d3ef4244d354cba541ce8d3f0ded9773c89 (patch)
tree235507ca7727676a55b8eb3c3e3936bacac67d77
parent8659ca9ef9c1b0826799ea8da217c886ff0c26b5 (diff)
downloadinitscripts-12a83d3ef4244d354cba541ce8d3f0ded9773c89.tar
initscripts-12a83d3ef4244d354cba541ce8d3f0ded9773c89.tar.gz
initscripts-12a83d3ef4244d354cba541ce8d3f0ded9773c89.tar.bz2
initscripts-12a83d3ef4244d354cba541ce8d3f0ded9773c89.tar.xz
initscripts-12a83d3ef4244d354cba541ce8d3f0ded9773c89.zip
network-scripts: setting of firewall ZONE fixed
For currently unknown reason the dbus-send calls will fail to set the firewall zone for the given interface if we omit the --print-reply option... This looks like some kind of race-condition in dbus-send, since the --print-reply makes the call synchronous and slower. Hopefully this is only a temporary workaround until DBus is fixed. Resolves: #1586284
-rwxr-xr-xnetwork-scripts/ifdown-post4
-rwxr-xr-xnetwork-scripts/ifup-eth3
-rwxr-xr-xnetwork-scripts/ifup-post4
3 files changed, 6 insertions, 5 deletions
diff --git a/network-scripts/ifdown-post b/network-scripts/ifdown-post
index 83d48775..334cdaeb 100755
--- a/network-scripts/ifdown-post
+++ b/network-scripts/ifdown-post
@@ -53,9 +53,9 @@ if ! check_default_route ; then
fi
fi
-# Reset firewall ZONE to "default":
+# Reset firewall zone (empty ZONE means default):
if [ "${REALDEVICE}" != "lo" ]; then
- dbus-send --system --dest=org.fedoraproject.FirewallD1 \
+ dbus-send --print-reply --system --dest=org.fedoraproject.FirewallD1 \
/org/fedoraproject/FirewallD1 \
org.fedoraproject.FirewallD1.zone.removeInterface \
string:"" string:"${DEVICE}" \
diff --git a/network-scripts/ifup-eth b/network-scripts/ifup-eth
index a0988edb..932635d4 100755
--- a/network-scripts/ifup-eth
+++ b/network-scripts/ifup-eth
@@ -339,7 +339,8 @@ fi
/etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then
- # Assign interface into a firewalld zone so we can obtain the IPv6 via DHCPv6:
+ # Assign interface into a firewalld zone so we can
+ # obtain the IPv6 via DHCPv6 (empty ZONE means default):
if [ "${REALDEVICE}" != "lo" ]; then
dbus-send --print-reply --system --dest=org.fedoraproject.FirewallD1 \
/org/fedoraproject/FirewallD1 \
diff --git a/network-scripts/ifup-post b/network-scripts/ifup-post
index e1c5e391..5a89cbf3 100755
--- a/network-scripts/ifup-post
+++ b/network-scripts/ifup-post
@@ -132,9 +132,9 @@ if [ "$2" = "boot" -a \
fi
fi
-# Set firewall ZONE for this device (empty means default):
+# Set firewall ZONE for this device (empty ZONE means default):
if [ "${REALDEVICE}" != "lo" ]; then
- dbus-send --system --dest=org.fedoraproject.FirewallD1 \
+ dbus-send --print-reply --system --dest=org.fedoraproject.FirewallD1 \
/org/fedoraproject/FirewallD1 \
org.fedoraproject.FirewallD1.zone.changeZoneOfInterface \
string:"${ZONE}" string:"${DEVICE}" \