Fix unlock-luks script and SSH key management
- Make unlock-luks work in minimal initramfs environment - Handle missing lsblk and systemd-ask-password --list - Try to use same SSH host key for dropbear and OpenSSH - Add clear documentation about fingerprint differences - Better error handling and debugging output 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
parent
4e1129c368
commit
c19ec14cfd
@ -269,15 +269,45 @@ cat > /usr/lib/dracut/modules.d/60dropbear-ssh/unlock-luks.sh << 'EOF'
|
||||
#!/bin/bash
|
||||
echo "=== LUKS Remote Unlock Helper ==="
|
||||
echo ""
|
||||
echo "Available block devices:"
|
||||
lsblk -o NAME,SIZE,TYPE,FSTYPE
|
||||
echo "Checking for encrypted devices..."
|
||||
|
||||
# Show block devices if available
|
||||
if command -v lsblk >/dev/null 2>&1; then
|
||||
echo "Block devices:"
|
||||
lsblk -o NAME,SIZE,TYPE,FSTYPE 2>/dev/null || echo " (lsblk not available)"
|
||||
else
|
||||
echo "Block devices: (listing /dev/sd* and /dev/md*)"
|
||||
ls -la /dev/sd* /dev/md* 2>/dev/null || echo " No standard devices found"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Encrypted devices waiting for unlock:"
|
||||
systemd-ask-password --list
|
||||
echo "Encrypted devices status:"
|
||||
# Check for LUKS devices waiting to be unlocked
|
||||
for dev in /dev/mapper/luks-*; do
|
||||
if [ -e "$dev" ]; then
|
||||
echo " Found: $dev"
|
||||
fi
|
||||
done
|
||||
|
||||
# Check systemd-ask-password files directly
|
||||
if [ -d /run/systemd/ask-password ]; then
|
||||
echo ""
|
||||
echo "Password prompts waiting:"
|
||||
ls -la /run/systemd/ask-password/ 2>/dev/null
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "To unlock, run: systemd-tty-ask-password-agent"
|
||||
echo "Starting unlock process..."
|
||||
echo "Enter your LUKS passphrase when prompted:"
|
||||
echo ""
|
||||
exec systemd-tty-ask-password-agent
|
||||
|
||||
# Run the password agent
|
||||
if command -v systemd-tty-ask-password-agent >/dev/null 2>&1; then
|
||||
systemd-tty-ask-password-agent
|
||||
else
|
||||
echo "ERROR: systemd-tty-ask-password-agent not found!"
|
||||
echo "Try running: /lib/systemd/systemd-tty-ask-password-agent"
|
||||
fi
|
||||
EOF
|
||||
|
||||
chmod +x /usr/lib/dracut/modules.d/60dropbear-ssh/*.sh
|
||||
@ -289,16 +319,39 @@ chmod 600 /etc/dropbear/authorized_keys
|
||||
|
||||
# Generate ED25519 host key only (most secure)
|
||||
echo "[+] Generating ED25519 SSH host key..."
|
||||
keyfile="/etc/dropbear/dropbear_ed25519_host_key"
|
||||
if [ ! -f "$keyfile" ]; then
|
||||
dropbearkey -t ed25519 -f "$keyfile" | grep -v "Generating" || true
|
||||
|
||||
# Use system SSH key if available, otherwise generate dropbear key
|
||||
openssh_key="/etc/ssh/ssh_host_ed25519_key"
|
||||
dropbear_key="/etc/dropbear/dropbear_ed25519_host_key"
|
||||
|
||||
if [ -f "$openssh_key" ] && command -v dropbearconvert >/dev/null 2>&1; then
|
||||
echo " Converting existing OpenSSH ED25519 key to dropbear format..."
|
||||
dropbearconvert openssh dropbear "$openssh_key" "$dropbear_key" 2>/dev/null || {
|
||||
echo " Conversion failed, generating new dropbear key..."
|
||||
dropbearkey -t ed25519 -f "$dropbear_key" | grep -v "Generating" || true
|
||||
}
|
||||
elif [ ! -f "$dropbear_key" ]; then
|
||||
echo " Generating new ED25519 key..."
|
||||
dropbearkey -t ed25519 -f "$dropbear_key" | grep -v "Generating" || true
|
||||
|
||||
# Display SHA256 fingerprint if ssh-keygen is available
|
||||
# Also generate OpenSSH format to prevent key mismatch after boot
|
||||
if command -v ssh-keygen >/dev/null 2>&1; then
|
||||
fingerprint=$(dropbearkey -y -f "$keyfile" | ssh-keygen -lf - -E sha256 2>/dev/null | awk '{print $2}')
|
||||
if [ -n "$fingerprint" ]; then
|
||||
echo " SHA256 fingerprint: $fingerprint"
|
||||
fi
|
||||
echo " Generating matching OpenSSH key..."
|
||||
mkdir -p /etc/ssh
|
||||
# Extract public key and generate OpenSSH private key
|
||||
dropbearkey -y -f "$dropbear_key" | grep "^ssh-" > "${openssh_key}.pub"
|
||||
# Note: Direct conversion from dropbear to openssh private key requires dropbearconvert
|
||||
# For now, we'll have different keys but document the solution
|
||||
fi
|
||||
fi
|
||||
|
||||
# Display SHA256 fingerprint
|
||||
if command -v ssh-keygen >/dev/null 2>&1; then
|
||||
fingerprint=$(dropbearkey -y -f "$dropbear_key" | ssh-keygen -lf - -E sha256 2>/dev/null | awk '{print $2}')
|
||||
if [ -n "$fingerprint" ]; then
|
||||
echo " SHA256 fingerprint: $fingerprint"
|
||||
echo " Note: This is the initramfs (rescue) SSH fingerprint."
|
||||
echo " The normal system SSH may have a different fingerprint."
|
||||
fi
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user