mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Merge remote-tracking branch 'apache/4.18' into 4.19
This commit is contained in:
commit
e86363be8e
@ -619,7 +619,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
|
||||
// FIXME: take a global database lock here for safety.
|
||||
boolean onWindows = isOnWindows();
|
||||
if(!onWindows) {
|
||||
Script.runSimpleBashScript("if [ -f " + privkeyfile + " ]; then rm -f " + privkeyfile + "; fi; ssh-keygen -t ed25519 -m PEM -N '' -f " + privkeyfile + " -q 2>/dev/null || ssh-keygen -t ed25519 -N '' -f " + privkeyfile + " -q");
|
||||
Script.runSimpleBashScript("if [ -f " + privkeyfile + " ]; then rm -f " + privkeyfile + "; fi; ssh-keygen -t ecdsa -m PEM -N '' -f " + privkeyfile + " -q 2>/dev/null || ssh-keygen -t ecdsa -N '' -f " + privkeyfile + " -q");
|
||||
}
|
||||
|
||||
final String privateKey;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user