diff options
| author | Sebastian Schmelzer | 2008-09-26 19:33:13 +0200 |
|---|---|---|
| committer | Sebastian Schmelzer | 2008-09-26 19:33:13 +0200 |
| commit | 8c5421dc68cd617770890653cb022711b7f2d804 (patch) | |
| tree | 0e410bc3e68048df2be345aaefd752ca56bbcd42 | |
| parent | * added libz to rootfs (diff) | |
| download | core-8c5421dc68cd617770890653cb022711b7f2d804.tar.gz core-8c5421dc68cd617770890653cb022711b7f2d804.tar.xz core-8c5421dc68cd617770890653cb022711b7f2d804.zip | |
* updatet to dropbear 0.51
(build as multi binary)
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2252 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm | 3 | ||||
| -rw-r--r-- | os-plugins/plugins/dropbear/XX_dropbear.sh | 22 | ||||
| -rwxr-xr-x | os-plugins/plugins/dropbear/files/dropbearmulti | bin | 0 -> 160408 bytes |
3 files changed, 20 insertions, 5 deletions
diff --git a/os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm b/os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm index 5796cb6a..a613b48e 100644 --- a/os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm +++ b/os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm @@ -85,8 +85,7 @@ sub installationPhase my $filesDir = "$openslxBasePath/lib/plugins/dropbear/files"; - copyFile("$filesDir/bin/dropbear","$pluginRepoPath/bin"); - copyFile("$filesDir/bin/dropbearkey","$pluginRepoPath/bin"); + copyFile("$filesDir/dropbearmulti","$pluginRepoPath"); return; } diff --git a/os-plugins/plugins/dropbear/XX_dropbear.sh b/os-plugins/plugins/dropbear/XX_dropbear.sh index f3137a10..28b9dbb1 100644 --- a/os-plugins/plugins/dropbear/XX_dropbear.sh +++ b/os-plugins/plugins/dropbear/XX_dropbear.sh @@ -19,10 +19,26 @@ if [ -e /initramfs/plugin-conf/dropbear.conf ]; then . /initramfs/plugin-conf/dropbear.conf if [ $dropbear_active -ne 0 ]; then [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'dropbear' os-plugin ..."; + + # setup links to multibinary + ln -sf /mnt/opt/openslx/plugin-repo/dropbear/dropbearmulti /sbin/dropbear + ln -sf /mnt/opt/openslx/plugin-repo/dropbear/dropbearmulti /sbin/dropbearkey + ln -sf /mnt/opt/openslx/plugin-repo/dropbear/dropbearmulti /sbin/dropbearconvert + ln -sf /mnt/opt/openslx/plugin-repo/dropbear/dropbearmulti /bin/dbclient + ln -sf /mnt/opt/openslx/plugin-repo/dropbear/dropbearmulti /bin/scp + + # create dropbear config dir + mkdir -p /etc/dropbear + + # convert openssh rsa key to dropbear key - if available + if [ -e /mnt/etc/ssh/ssh_host_rsa_key ] + 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 - /mnt/opt/openslx/plugin-repo/dropbear/bin/dropbear \ - -d /mnt/etc/ssh/ssh_host_dsa_key \ - -r /mnt/etc/ssh/ssh_host_rsa_key + /sbin/dropbear [ $DEBUGLEVEL -gt 0 ] && echo "done with 'dropbear' os-plugin ..."; diff --git a/os-plugins/plugins/dropbear/files/dropbearmulti b/os-plugins/plugins/dropbear/files/dropbearmulti Binary files differnew file mode 100755 index 00000000..357e644f --- /dev/null +++ b/os-plugins/plugins/dropbear/files/dropbearmulti |