synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve message for SSH key copying during install (#624) 

This only displays the ssh key note if no keys are found, since it's
confusing if a user has 1 key but not the other. In that case, the
message would be displayed despite copying one of the keys over.
This commit is contained in:
clayton craft 2017-09-24 14:02:17 +00:00 committed by Oliver Smith
parent df0566538e
commit d98cb50347
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pmb/install/install.py
View File

@ -129,8 +129,6 @@ def copy_ssh_key(args):
for key in ["RSA", "Ed25519"]:
user_ssh_pubkey = os.path.expanduser("~/.ssh/id_" + key.lower() + ".pub")
if not os.path.exists(user_ssh_pubkey):
logging.info("NOTE: Public " + key + " SSH key not found. If no SSH key " +
"is copied, you will need to use SSH password authentication!")
continue
if pmb.helpers.cli.confirm(
args, "Would you like to copy your " + key + " SSH public key to the device?"):
@ -138,6 +136,8 @@ def copy_ssh_key(args):
keys += infile.readlines()
if not len(keys):
logging.info("NOTE: Public SSH keys not found. Since no SSH keys " +
"were copied, you will need to use SSH password authentication!")
return
authorized_keys = args.work + "/chroot_native/tmp/authorized_keys"