From 03e52ac31751a5eeddb7f2a83ad26687bf78ae4f Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit@apache.org>
Date: Tue, 23 Apr 2019 13:21:28 +0530
Subject: [PATCH] systemvm: remove unknown default ssh public key and fix
 centos6 unary issue (#73)

This fixes a unary comparison issue on older bash (centos6) and removes unknown default ssh public key.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 scripts/vm/hypervisor/kvm/patch.sh        | 2 +-
 systemvm/debian/root/.ssh/authorized_keys | 1 -
 systemvm/pom.xml                          | 7 -------
 3 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 systemvm/debian/root/.ssh/authorized_keys

diff --git a/scripts/vm/hypervisor/kvm/patch.sh b/scripts/vm/hypervisor/kvm/patch.sh
index 72bcdc6f6f3..e7c79fd9a73 100755
--- a/scripts/vm/hypervisor/kvm/patch.sh
+++ b/scripts/vm/hypervisor/kvm/patch.sh
@@ -65,7 +65,7 @@ do
 done
 
 # Test guest agent sanity
-while [ $(virsh qemu-agent-command $name '{"execute":"guest-sync","arguments":{"id":1234567890}}' 2>/dev/null) != '{"return":1234567890}' ]
+while [ "$(virsh qemu-agent-command $name '{"execute":"guest-sync","arguments":{"id":1234567890}}' 2>/dev/null)" != '{"return":1234567890}' ]
 do
     sleep 0.1
 done
diff --git a/systemvm/debian/root/.ssh/authorized_keys b/systemvm/debian/root/.ssh/authorized_keys
deleted file mode 100644
index c09f6379a34..00000000000
--- a/systemvm/debian/root/.ssh/authorized_keys
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2RIE3hgSAD8zULuyE7KDW9EKh2oVbNGY7iSL/VI5xHLISKh4e8ksTshWjlGBtrUCnuzR7y2BUxZ65RI8XkB1fEDxcOU4/0lVPvJYDSsGveXoOgpLwOtKRoGLgjFUGzBQlj2s6YaYQxoNTqtBVkDIH6ekPNq0Q38hRrFcsVIk1sFo5ejuvFxt2wx6APcFIQtHSNezEDO0GVUScDU1N1YEMMv1PU3M/SrcezkXrGl/efF3kWtY9L5xm7sojHMCCqsI38r8ogof67F7JdWRXM6Nl3VzkdCBzWGcyAl+cYfjzgOiBGXyAyYBk8qqzJjKwUOtdjfRvCyowA/0xBwMW1T7PQ==
diff --git a/systemvm/pom.xml b/systemvm/pom.xml
index 5a29a34c68e..60312f2ef15 100644
--- a/systemvm/pom.xml
+++ b/systemvm/pom.xml
@@ -87,12 +87,6 @@
                     <include>agent.zip</include>
                   </includes>
                 </resource>
-                <resource>
-                  <directory>debian/root/.ssh</directory>
-                  <includes>
-                    <include>authorized_keys</include>
-                  </includes>
-                </resource>
               </resources>              
             </configuration>            
           </execution>
@@ -167,7 +161,6 @@
            <argument>systemvm.iso</argument>
            <argument>agent.zip</argument>
            <argument>cloud-scripts.tgz</argument>
-           <argument>authorized_keys</argument>
          </arguments>
        </configuration>
      </plugin>