[docker-io] firewalld, sysvinit fixes

[Lokesh Mandvekar]

commit 382fc1a54be7be13fbb412d2001d2b38652eeee8
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Sat Nov 30 19:34:14 2013 -0600

    firewalld, sysvinit fixes
    
    Signed-off-by: Lokesh Mandvekar <lsm5 at redhat.com>

 docker-io.spec   |   19 ++++++++++++++++---
 docker.service   |    3 ++-
 docker.sysconfig |    2 +-
 docker.sysvinit  |    8 +++++++-
 4 files changed, 26 insertions(+), 6 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 4cb0222..c0a85ab 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 %bcond_without  systemd
 %endif
 
@@ -14,7 +14,7 @@
 
 Name:           docker-io
 Version:        0.7.0
-Release:        10%{?dist}
+Release:        12%{?dist}
 Summary:        Automates deployment of containerized applications
 License:        ASL 2.0
 
@@ -116,7 +116,7 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/docker
 install -d %{buildroot}%{_initddir}
 install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/docker
 %endif
-# don't submit release 10 to epel until verified, only fedora for now
+# not included in epel until verified, only fedora for now
 %if 0%{?fedora} >= 19
 install -d %{buildroot}%{_sysconfdir}/udev/rules.d
 install -p -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/udev/rules.d
@@ -174,6 +174,19 @@ fi
 %endif
 
 %changelog
+* Sat Nov 30 2013 Lokesh Mandvekar <lsm5 at redhat.com> - 0.7.0-12
+- 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)
+
+* Fri Nov 29 2013 Marek Goldmann <mgoldman at redhat.com> - 0.7.0-11
+- Redirect docker log to /var/log/docker (epel only)
+- Removed the '-b none' parameter from sysconfig, it's unnecessary since
+  we create the bridge now automatically (epel only)
+- Make sure we have the cgconfig service started before we start docker,
+    RHBZ#1034919 (epel only)
+
 * Thu Nov 28 2013 Lokesh Mandvekar <lsm5 at redhat.com> - 0.7.0-10
 - udev rules added for fedora >= 19 BZ 1034095
 - epel testing pending
diff --git a/docker.service b/docker.service
index ac0e340..6610353 100644
--- a/docker.service
+++ b/docker.service
@@ -1,12 +1,13 @@
 [Unit]
 Description=Docker container management daemon
-Requires=firewalld.service
+Wants=firewalld.service
 After=firewalld.service
 
 [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
 Restart=on-failure
 
 [Install]
diff --git a/docker.sysconfig b/docker.sysconfig
index dbb3944..db78a40 100644
--- a/docker.sysconfig
+++ b/docker.sysconfig
@@ -1 +1 @@
-other_args="-b none"
+other_args=""
diff --git a/docker.sysvinit b/docker.sysvinit
index d3c29a8..7f0ed93 100644
--- a/docker.sysvinit
+++ b/docker.sysvinit
@@ -9,7 +9,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       docker
-# Required-Start: $network 
+# Required-Start: $network cgconfig
 # Required-Stop:
 # Should-Start:
 # Should-Stop:
@@ -26,10 +26,16 @@ exec="/usr/bin/docker"
 prog="docker"
 pidfile="/var/run/$prog.pid"
 lockfile="/var/lock/subsys/$prog"
+logfile="/var/log/$prog"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
 prestart() {
+    service cgconfig status > /dev/null
+
+    if [[ $? != 0 ]]; then
+        service cgconfig start
+    fi
 
     preexec="/sbin/sysctl"
     [ -x $preexec ] || exit 6