This is an automated email from the ASF dual-hosted git repository. andrijapanic pushed a commit to branch update-injectkeys.ssh-message in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 0c6fed40c501f5768d532e4a9dd2a566552058a8 Author: Andrija Panic <[email protected]> AuthorDate: Thu Jan 9 23:24:11 2020 +0100 Update message when keys are NOT being injected --- scripts/vm/systemvm/injectkeys.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vm/systemvm/injectkeys.sh b/scripts/vm/systemvm/injectkeys.sh index b66b8b5..c501451 100755 --- a/scripts/vm/systemvm/injectkeys.sh +++ b/scripts/vm/systemvm/injectkeys.sh @@ -45,7 +45,7 @@ inject_into_iso() { [ ! -f $isofile ] && echo "$(basename $0): Could not find systemvm iso patch file $isofile" && return 1 bsdtar -C $MOUNTPATH -xf $isofile [ $? -ne 0 ] && echo "$(basename $0): Failed to extract original iso $isofile" && clean_up && return 1 - diff -q $MOUNTPATH/authorized_keys $newpubkey &> /dev/null && clean_up && return 0 + diff -q $MOUNTPATH/authorized_keys $newpubkey &> /dev/null && echo "New public key is the same as the one in the systemvm.iso, not injecting it, not modifying systemvm.iso" && clean_up && return 0 backup_iso [ $? -ne 0 ] && echo "$(basename $0): Failed to backup original iso $isofile" && clean_up && return 1 $SUDO cp $newpubkey $MOUNTPATH/authorized_keys
