Merge pull request #1690 from Bastian-Krause/bst/shelldriver-reactivation-with-key

driver/shelldriver: handle existing /tmp/labgrid-ssh/ gracefully

Author: Emantor

labgrid/driver/shelldriver.py

@@ -275,7 +275,7 @@ def _put_ssh_key(self, keyfile_path):
             return
 
         self.logger.debug("Key not on target and not writeable, using bind mount...")
-        self._run_check('mkdir -m 700 /tmp/labgrid-ssh/')
+        self._run_check('mkdir -p -m 700 /tmp/labgrid-ssh/')
         self._run("cp -a ~/.ssh/* /tmp/labgrid-ssh/")
         self._write_key(keyline, "/tmp/labgrid-ssh/authorized_keys")
         self._run_check('chmod 600 /tmp/labgrid-ssh/authorized_keys')