lxc-docker-nosha.patch

   1 Only in docker-0.7.0/: build
   2 diff -ur docker-0.7.0-o/utils/utils.go docker-0.7.0/utils/utils.go
   3 --- docker-0.7.0-o/utils/utils.go       2013-11-26 01:09:45.000000000 -0700
   4 +++ docker-0.7.0/utils/utils.go 2013-11-28 12:39:38.000000000 -0700
   5 @@ -272,10 +272,6 @@
   6  // Figure out the path of our dockerinit (which may be SelfPath())
   7  func DockerInitPath(localCopy string) string {
   8         selfPath := SelfPath()
   9 -       if isValidDockerInitPath(selfPath, selfPath) {
  10 -               // if we're valid, don't bother checking anything else
  11 -               return selfPath
  12 -       }
  13         var possibleInits = []string{
  14                 localCopy,
  15                 filepath.Join(filepath.Dir(selfPath), "dockerinit"),
  16 @@ -291,9 +287,7 @@
  17                                 // LookPath already validated that this file exists and is executable (following symlinks), so how could Abs fail?
  18                                 panic(err)
  19                         }
  20 -                       if isValidDockerInitPath(path, selfPath) {
  21 -                               return path
  22 -                       }
  23 +            return path
  24                 }
  25         }
  26         return ""
  27 Only in docker-0.7.0/utils: utils.go~