restore ignore-dockerinit-checksum patch

since we still have dockerinit, let's restore
this patch to prevent unexpected side effects

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=64
This commit is contained in:
Jordi Massaguer 2016-02-09 11:59:56 +00:00 committed by Git OBS Bridge
parent aadf656db7
commit 43ef6adcd8
2 changed files with 14 additions and 0 deletions

View File

@ -47,6 +47,7 @@ Patch2: fix-docker-init.patch
Patch100: gcc-go-patches.patch Patch100: gcc-go-patches.patch
Patch101: fix-ppc64le.patch Patch101: fix-ppc64le.patch
Patch102: netlink_gcc_go.patch Patch102: netlink_gcc_go.patch
Patch103: ignore-dockerinit-checksum.patch
BuildRequires: audit BuildRequires: audit
BuildRequires: bash-completion BuildRequires: bash-completion
BuildRequires: device-mapper-devel >= 1.2.68 BuildRequires: device-mapper-devel >= 1.2.68
@ -155,6 +156,7 @@ Test package for docker. It contains the source code and the tests.
%patch100 -p1 %patch100 -p1
%patch101 -p1 %patch101 -p1
%patch102 -p1 %patch102 -p1
%patch103 -p1
%endif %endif
cp %{SOURCE7} . cp %{SOURCE7} .

View File

@ -0,0 +1,12 @@
diff -Naur a/utils/utils.go b/utils/utils.go
--- a/utils/utils.go 2015-08-11 18:35:27.000000000 +0200
+++ b/utils/utils.go 2015-08-12 18:06:47.930445696 +0200
@@ -76,7 +76,7 @@
}
return os.SameFile(targetFileInfo, selfPathFileInfo)
}
- return dockerversion.INITSHA1 != "" && dockerInitSha1(target) == dockerversion.INITSHA1
+ return true
}
// DockerInitPath figures out the path of our dockerinit (which may be SelfPath())