quark
/
quarks
1
0
Fork 0
Code Pull Requests Activity

sys-kernel/dracut: Updated crypt-ssh patch

This commit is contained in:
Stefan Reimer 2013-04-03 23:20:42 -07:00
parent 922b1a9ac7
commit 7736539aa1
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sys-kernel/dracut/files/027-crypt-ssh.patch
View File

@ -1,14 +1,14 @@
commit 435277eac4489ef0fe1aa33591ae4aa27520ab63 commit 2a662251cf8d8163d5fbd42cd4c08329d58f2486
Author: Stefan Reimer <it@startux.de> Author: Stefan Reimer <it@startux.de>
Date: Sat Mar 30 13:02:51 2013 -0700 Date: Wed Apr 3 23:18:19 2013 -0700
Add initial version of crypt-ssh Initial version of the crypt-ssh module
diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
index 9665e48..026b127 100755 index 9665e48..2d81684 100755
--- a/modules.d/90crypt/cryptroot-ask.sh --- a/modules.d/90crypt/cryptroot-ask.sh
+++ b/modules.d/90crypt/cryptroot-ask.sh +++ b/modules.d/90crypt/cryptroot-ask.sh
@@ -146,11 +146,16 @@ fi @@ -146,12 +146,26 @@ fi
if [ $ask_passphrase -ne 0 ]; then if [ $ask_passphrase -ne 0 ]; then
luks_open="$(command -v cryptsetup) $cryptsetupopts luksOpen" luks_open="$(command -v cryptsetup) $cryptsetupopts luksOpen"
@ -17,25 +17,36 @@ index 9665e48..026b127 100755
- --ply-prompt "Password ($device)" \ - --ply-prompt "Password ($device)" \
- --tty-tries 1 \ - --tty-tries 1 \
- --tty-cmd "$luks_open -T5 $device $luksname" - --tty-cmd "$luks_open -T5 $device $luksname"
- unset luks_open
+ port=22001
+ +
+ if getarg 1 rc.luks.ssh; then + if getargbool 0 rd.luks.ssh; then
+ # Setup authorized_key file
+ echo -n "command=\"$luks_open -T5 $device $luksname && rm -f /root/.ssh/key.pub \" " > /root/.ssh/authorized_keys
+ cat /root/.ssh/key.pub >> /root/.ssh/authorized_keys && chmod 600 /root/.ssh/authorized_keys
+ echo "Starting SSH server on port $port"
+ /usr/sbin/dropbear -p $port -m -j -k -s
+ while [ -f /root/.ssh/key.pub ]; do
+ sleep 1
+ done
+ kill $(cat /var/run/dropbear.pid)
+ else
+ ask_for_password --ply-tries 5 \ + ask_for_password --ply-tries 5 \
+ --ply-cmd "$luks_open -T1 $device $luksname" \ + --ply-cmd "$luks_open -T1 $device $luksname" \
+ --ply-prompt "Password ($device)" \ + --ply-prompt "Password ($device)" \
+ --tty-tries 1 \ + --tty-tries 1 \
+ --tty-cmd "$luks_open -T5 $device $luksname" + --tty-cmd "$luks_open -T5 $device $luksname"
+ else
+ /usr/sbin/dropbear -p 22001 -F -m -j -k -s
+ fi + fi
unset luks_open + unset luks_open port
fi fi
unset device luksname luksfile
diff --git a/modules.d/92crypt-ssh/module-setup.sh b/modules.d/92crypt-ssh/module-setup.sh diff --git a/modules.d/92crypt-ssh/module-setup.sh b/modules.d/92crypt-ssh/module-setup.sh
new file mode 100644 new file mode 100644
index 0000000..d5e1342 index 0000000..ac0785b
--- /dev/null --- /dev/null
+++ b/modules.d/92crypt-ssh/module-setup.sh +++ b/modules.d/92crypt-ssh/module-setup.sh
@@ -0,0 +1,26 @@ @@ -0,0 +1,27 @@
+#!/bin/bash +#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh +# ex: ts=8 sw=4 sts=4 et filetype=sh
@ -58,8 +69,8 @@ index 0000000..d5e1342
+ [ -r /etc/dropbear/dropbear_dss_host_key ] || /usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null + [ -r /etc/dropbear/dropbear_dss_host_key ] || /usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null
+ [ -r /etc/dropbear/dropbear_rsa_host_key ] || /usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null + [ -r /etc/dropbear/dropbear_rsa_host_key ] || /usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null
+ +
+ inst /usr/sbin/dropbear "/usr/sbin/dropbear" + inst /usr/sbin/dropbear
+ inst /etc/dropbear/dropbear_dss_host_key "/etc/dropbear/dropbear_dss_host_key" + inst /etc/dropbear/dropbear_dss_host_key
+ inst /etc/dropbear/dropbear_rsa_host_key "/etc/dropbear/dropbear_rsa_host_key" + inst /etc/dropbear/dropbear_rsa_host_key
+ [ -r /root/.ssh/authorized_keys ] && inst /root/.ssh/authorized_keys "/etc/dropbear/authorized_keys" + [ -r /root/.ssh/authorized_keys ] && inst /root/.ssh/authorized_keys /root/.ssh/key.pub
+} +}