Merge branch 'master' into master

This commit is contained in:
Stéphane Lesimple 2020-11-13 18:52:30 +01:00 committed by GitHub
commit 811b2f9c15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -68,6 +68,6 @@ OVH::Bastion::syslogFormatted(
osh_warn("ADMIN SUDO: $self, you'll now impersonate $sudoAs, this has been logged.");
$fnret = OVH::Bastion::execute(cmd => \@cmd, noisy_stdout => 1, noisy_stderr => 1);
$fnret = OVH::Bastion::execute(cmd => \@cmd, noisy_stdout => 1, noisy_stderr => 1, expects_stdin => 1);
osh_exit $fnret;

View file

@ -9,7 +9,7 @@ else
fi
if [ "$1" = "--sandbox" ]; then
"The Bastion sandbox container is running, you can now connect to its port 22 (probably remapped to another port on the host)"
echo "The Bastion sandbox container is running, you can now connect to its port 22 (probably remapped to another port on the host)"
fi
while : ; do
sleep 3600