From d7c86d556fc465406b42d96cff6ba6b6ab0e3933 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Thu, 9 Jun 2011 15:15:31 +0200
Subject: fix dropbear plugin

---
 src/initramfs/scripts/init                     |  2 ++
 src/os-plugins/plugins/dropbear/XX_dropbear.sh | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init
index 716bab2b..b0cd40e1 100755
--- a/src/initramfs/scripts/init
+++ b/src/initramfs/scripts/init
@@ -47,6 +47,8 @@ ln -s /proc/self/fd/0 /dev/stdin
 ln -s /proc/self/fd/1 /dev/stdout
 ln -s /proc/self/fd/2 /dev/stderr
 
+mount -t devpts devpts /dev/pts
+
 # redirect kernel messages to tty10 instead of the standard console
 getty -i -n -l /bin/cat 38400 tty10 &
 setlogcons 10
diff --git a/src/os-plugins/plugins/dropbear/XX_dropbear.sh b/src/os-plugins/plugins/dropbear/XX_dropbear.sh
index b43844af..de25a6f0 100644
--- a/src/os-plugins/plugins/dropbear/XX_dropbear.sh
+++ b/src/os-plugins/plugins/dropbear/XX_dropbear.sh
@@ -39,12 +39,13 @@ if [ -e /initramfs/plugin-conf/dropbear.conf ]; then
        sed -i /etc/passwd -e "s/bash/sh/"       
 
        # convert openssh rsa key to dropbear key - if available
-       if [ -e /mnt/etc/ssh/ssh_host_rsa_key ]; then
-         dropbearconvert openssh dropbear /mnt/etc/ssh/ssh_host_rsa_key \
-           /etc/dropbear/dropbear_rsa_host_key
-       else 
-         dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
-       fi
+       #if [ -e /mnt/etc/ssh/ssh_host_rsa_key ]; then
+       #  dropbearconvert openssh dropbear /mnt/etc/ssh/ssh_host_rsa_key \
+       #    /etc/dropbear/dropbear_rsa_host_key
+       #else 
+       dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
+       dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key
+       #fi
 
        echo "OpenSLX Debugshell (stage3)" >> /etc/motd
   
-- 
cgit v1.2.3-55-g7522