[docker-io] continue if firewalld not present

[Lokesh Mandvekar]

commit 0d447f5546fdc7a6388898d44141daabfe19de98
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Sun Dec 1 11:04:39 2013 -0600

    continue if firewalld not present
    
    Signed-off-by: Lokesh Mandvekar <lsm5 at redhat.com>

 docker-io.spec |    5 +++--
 docker.service |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index c0a85ab..d6a55a0 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -117,7 +117,7 @@ install -d %{buildroot}%{_initddir}
 install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/docker
 %endif
 # not included in epel until verified, only fedora for now
-%if 0%{?fedora} >= 19
+%if 0%{?fedora} >= 18
 install -d %{buildroot}%{_sysconfdir}/udev/rules.d
 install -p -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/udev/rules.d
 %endif
@@ -178,7 +178,8 @@ fi
 - systemd for fedora >= 18
 - firewalld in unit file changed from Requires to Wants
 - firewall-cmd --add-masquerade after docker daemon start in unit file
-  (mfojtik at redhat.com)
+  (Michal Fojtik <mfojtik at redhat.com>), continue if not present (Michael Young
+  <m.a.young at durham.ac.uk>)
 
 * Fri Nov 29 2013 Marek Goldmann <mgoldman at redhat.com> - 0.7.0-11
 - Redirect docker log to /var/log/docker (epel only)
diff --git a/docker.service b/docker.service
index 6610353..0803497 100644
--- a/docker.service
+++ b/docker.service
@@ -7,7 +7,7 @@ After=firewalld.service
 Type=simple
 ExecStartPre=/usr/sbin/sysctl -w net.ipv4.ip_forward=1 net.ipv6.conf.all.forwarding=1
 ExecStart=/usr/bin/docker -d
-ExecStartPost=firewall-cmd --add-masquerade
+ExecStartPost=-/usr/bin/firewall-cmd --add-masquerade
 Restart=on-failure
 
 [Install]