Repository: cloudstack
Updated Branches:
  refs/heads/master 1b5342b24 -> f3b132f63


Compabitility fix for Docker >= 1.11 (docker/docker#19490)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c92dcd2b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c92dcd2b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c92dcd2b

Branch: refs/heads/master
Commit: c92dcd2b32f6be4ef8915219698b9a4f3025cecc
Parents: e4ba640
Author: Manfred Touron <m...@42.am>
Authored: Sat May 14 21:38:42 2016 +0200
Committer: Manfred Touron <m...@42.am>
Committed: Thu Jun 30 17:21:53 2016 +0200

----------------------------------------------------------------------
 scripts/vm/systemvm/injectkeys.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c92dcd2b/scripts/vm/systemvm/injectkeys.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/systemvm/injectkeys.sh 
b/scripts/vm/systemvm/injectkeys.sh
index 863ca6a..9df1718 100755
--- a/scripts/vm/systemvm/injectkeys.sh
+++ b/scripts/vm/systemvm/injectkeys.sh
@@ -86,7 +86,7 @@ systemvmpath=$3
 command -v mkisofs > /dev/null   || (echo "$(basename $0): mkisofs not found, 
please install or ensure PATH is accurate" ; exit 4)
 
 # if running into Docker as unprivileges, skip ssh verification as iso cannot 
be mounted due to missing loop device.
-if [ -f /.dockerinit ]; then
+if [ -f /.dockerenv ]; then
   if [ -e /dev/loop0 ]; then
     # it's a docker instance with privileges.
     inject_into_iso systemvm.iso $newpubkey

Reply via email to