apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1548 from moul/patch-2

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

* pr/1548:
  Compabitility fix for Docker >= 1.11 (docker/docker#19490)

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
This commit is contained in:
Rajani Karuturi 2016-10-13 14:28:47 +05:30
commit f3b132f638
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/vm/systemvm/injectkeys.sh
View File

@ -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) 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 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 if [ -e /dev/loop0 ]; then
# it's a docker instance with privileges. # it's a docker instance with privileges.
inject_into_iso systemvm.iso $newpubkey inject_into_iso systemvm.iso $newpubkey