Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DLPX-78310 [Backport of DLPX-76794 to 6.0.12.0] recovery_sync dropbear failure causes delphix-bootcount service to fail on Ubuntu 20.04 #36

Merged
merged 1 commit into from
Nov 10, 2021
Merged

DLPX-78310 [Backport of DLPX-76794 to 6.0.12.0] recovery_sync dropbear failure causes delphix-bootcount service to fail on Ubuntu 20.04 #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions scripts/recovery_sync
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,19 @@ fi
for fmt in $(find /etc/ssh -name \*key | sed 's/.*host_\(.*\)_key/\1/'); do
# Unfortunately, dropbear doesn't support ed25519 keys.
[[ "$fmt" == "ed25519" ]] && continue
#
# On Ubuntu 20.04, ssh-keygen generates OpenSSH private keys by default,
# which have a header that is not supported by dropbearconvert. As a
# workaround, we first use ssh-keygen to convert they key to the older
# PEM format, and then feed that temporary key to dropbearconvert.
# Note that this bug has been fixed in a later version of
# dropbearconvert but that version is not available on Ubuntu 20.04.
#
cp "/etc/ssh/ssh_host_${fmt}_key" tmp.key
ssh-keygen -p -f tmp.key -N '' -P '' -m PEM
LD_LIBRARY_PATH="./usr/lib/x86_64-linux-gnu" ./usr/lib/dropbear/dropbearconvert \
openssh dropbear "/etc/ssh/ssh_host_${fmt}_key" \
"etc/dropbear/dropbear_${fmt}_host_key"
openssh dropbear tmp.key "etc/dropbear/dropbear_${fmt}_host_key"
rm tmp.key
done

rsync -a /etc/{machine-id,resolv.conf} etc/
Expand Down