You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/27 20:11:04 UTC
[6/7] git commit: updated refs/heads/master to d7859ad
Merge pull request #1109 from remibergsma/fix-CLOUDSTACK-9077
CLOUDSTACK-9077 Fix injectkeys.sh to work on CentOS7Fix regression from commit 3381154fafb7fa4f0a61d538f7c2550e48247787
The error seen on CentOS 7:
```
2015-11-20 21:51:16,161 DEBUG [c.c.s.ConfigurationServerImpl] (localhost-startStop-1:null) No loop device found, skipping ssh key insertion in systemvm.iso
```
Instead of detecting `/dev/loop0` this checks if we run inside Docker.
Tested on CentOS 7 and that now works again as expected.
```
2015-11-23 16:20:16,777 DEBUG [c.c.s.ConfigurationServerImpl] (localhost-startStop-1:null) Executing: /bin/bash /var/lib/tomcat/webapps/client/WEB-INF/classes/scripts/vm/systemvm/injectkeys.sh /home/cloud/.ssh/id_rsa.pub /home/cl
oud/.ssh/id_rsa /var/lib/tomcat/webapps/client/WEB-INF/classes/vms/systemvm.iso
2015-11-23 16:20:16,821 DEBUG [c.c.s.ConfigurationServerImpl] (localhost-startStop-1:null) Execution is successful.
2015-11-23 16:20:16,827 INFO [c.c.s.ConfigurationServerImpl] (localhost-startStop-1:null) Injected public and private keys into systemvm iso with result : null
```
Pinging @pdion891 to have a look.
* pr/1109:
CLOUDSTACK-9077 Fix injectkeys.sh to work on CentOS7
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/92913a15
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/92913a15
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/92913a15
Branch: refs/heads/master
Commit: 92913a154c00cb57a51e90c9622720062eb6a9cb
Parents: ad2bcc0 9b0b69d
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Nov 27 20:05:11 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Nov 27 20:05:11 2015 +0100
----------------------------------------------------------------------
scripts/vm/systemvm/injectkeys.sh | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------