Attachment 830646 Details for Bug 1034919 – Patch fot cgconfig boot

[patch] Patch fot cgconfig boot

0001-Changes-to-make-the-docker-service-start-docker-with.patch (text/plain), 2.02 KB, created by Marek Goldmann on 2013-11-29 13:15:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Goldmann

Created: 2013-11-29 13:15:32 UTC

Size: 2.02 KB

patch

obsolete

>From 2b6129e2778d80dab48ca3f15ccbd3ae5d0f1de5 Mon Sep 17 00:00:00 2001
>From: Marek Goldmann <marek.goldmann@gmail.com>
>Date: Fri, 29 Nov 2013 14:10:08 +0100
>Subject: [PATCH] Changes to make the docker service start docker without
> issues and with network connectivity out of the box.
>
>- Removed the '-b none' parameter from sysconfig, it's unnecessary
>  since we create the bridge now automatically
>- Make sure we have the cgconfig service started before we start
>  docker, 1034919
>---
> docker-io.spec   | 3 +++
> docker.sysconfig | 2 +-
> docker.sysvinit  | 9 +++++++--
> 3 files changed, 11 insertions(+), 3 deletions(-)
>
>diff --git a/docker-io.spec b/docker-io.spec
>index 8657dde..fdf7708 100644
>--- a/docker-io.spec
>+++ b/docker-io.spec
>@@ -176,6 +176,9 @@ fi
> %changelog
> * Fri Nov 29 2013 Marek Goldmann <mgoldman@redhat.com> - 0.7.0-11
> - Redirect docker log to /var/log/docker
>+- Removed the '-b none' parameter from sysconfig, it's unnecessary since
>+  we create the bridge now automatically
>+- Make sure we have the cgconfig service started before we start docker, RHBZ#1034919
> 
> * Thu Nov 28 2013 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.0-10
> - udev rules added for fedora >= 19 BZ 1034095
>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 a9feaad..bffeafb 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:
>@@ -32,11 +32,16 @@ logfile="/var/log/$prog"
> 
> prestart() {
> 
>+    service cgconfig status > /dev/null
>+
>+    if [[ $? != 0 ]]; then
>+        service cgconfig start
>+    fi
>+
>     preexec="/sbin/sysctl"
>     [ -x $preexec ] || exit 6
>     $preexec -w net.ipv4.ip_forward=1 > /dev/null 2>&1
>     $preexec -w net.ipv6.conf.all.forwarding=1 > /dev/null 2>&1
>-
> }
> 
> start() {
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 1034919: 830646