From fa6c215f7bac38b9bd9e43d55725a3066ff57fe3 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Mon, 4 Oct 2010 18:53:57 +0200
Subject: remove uclibc stuff - part II

---
 .../plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm      |   2 +-
 src/os-plugins/plugins/dropbear/XX_dropbear.sh         |   8 +++-----
 src/os-plugins/plugins/dropbear/files/dropbearmulti    | Bin 160408 -> 0 bytes
 .../plugins/dropbear/files/lib/libcrypt.so.1           | Bin 0 -> 38360 bytes
 src/os-plugins/plugins/dropbear/files/lib/libutil.so.1 | Bin 0 -> 9748 bytes
 src/os-plugins/plugins/dropbear/files/usr/bin/dbclient | Bin 0 -> 122644 bytes
 .../plugins/dropbear/files/usr/bin/dropbearkey         | Bin 0 -> 59264 bytes
 .../plugins/dropbear/files/usr/sbin/dropbear           | Bin 0 -> 133720 bytes
 8 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100755 src/os-plugins/plugins/dropbear/files/dropbearmulti
 create mode 100644 src/os-plugins/plugins/dropbear/files/lib/libcrypt.so.1
 create mode 100644 src/os-plugins/plugins/dropbear/files/lib/libutil.so.1
 create mode 100755 src/os-plugins/plugins/dropbear/files/usr/bin/dbclient
 create mode 100755 src/os-plugins/plugins/dropbear/files/usr/bin/dropbearkey
 create mode 100755 src/os-plugins/plugins/dropbear/files/usr/sbin/dropbear

(limited to 'src/os-plugins/plugins/dropbear')

diff --git a/src/os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm b/src/os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm
index fc1b96f8..bfd03309 100644
--- a/src/os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm
+++ b/src/os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm
@@ -85,7 +85,7 @@ sub installationPhase
 
     my $filesDir = "$openslxBasePath/lib/plugins/dropbear/files";
 
-	copyFile("$filesDir/dropbearmulti","$pluginRepoPath");
+    slxsystem("cp -r $filesDir/* $pluginRepoPath")
 
     return;
 }
diff --git a/src/os-plugins/plugins/dropbear/XX_dropbear.sh b/src/os-plugins/plugins/dropbear/XX_dropbear.sh
index cb4321ff..b43844af 100644
--- a/src/os-plugins/plugins/dropbear/XX_dropbear.sh
+++ b/src/os-plugins/plugins/dropbear/XX_dropbear.sh
@@ -20,12 +20,10 @@ if [ -e /initramfs/plugin-conf/dropbear.conf ]; then
   if [ $dropbear_active -ne 0 ]; then
     [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'dropbear' os-plugin ...";
 
+       # TODO: TESTEN !!!
        # 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
+       tar -cp -C /mnt/opt/openslx/plugin-repo/dropbear usr lib  |\
+         tar -xp -C /
 
        # create dropbear config dir
        mkdir -p /etc/dropbear
diff --git a/src/os-plugins/plugins/dropbear/files/dropbearmulti b/src/os-plugins/plugins/dropbear/files/dropbearmulti
deleted file mode 100755
index 357e644f..00000000
Binary files a/src/os-plugins/plugins/dropbear/files/dropbearmulti and /dev/null differ
diff --git a/src/os-plugins/plugins/dropbear/files/lib/libcrypt.so.1 b/src/os-plugins/plugins/dropbear/files/lib/libcrypt.so.1
new file mode 100644
index 00000000..4692c6fa
Binary files /dev/null and b/src/os-plugins/plugins/dropbear/files/lib/libcrypt.so.1 differ
diff --git a/src/os-plugins/plugins/dropbear/files/lib/libutil.so.1 b/src/os-plugins/plugins/dropbear/files/lib/libutil.so.1
new file mode 100644
index 00000000..1864dcd6
Binary files /dev/null and b/src/os-plugins/plugins/dropbear/files/lib/libutil.so.1 differ
diff --git a/src/os-plugins/plugins/dropbear/files/usr/bin/dbclient b/src/os-plugins/plugins/dropbear/files/usr/bin/dbclient
new file mode 100755
index 00000000..b7235203
Binary files /dev/null and b/src/os-plugins/plugins/dropbear/files/usr/bin/dbclient differ
diff --git a/src/os-plugins/plugins/dropbear/files/usr/bin/dropbearkey b/src/os-plugins/plugins/dropbear/files/usr/bin/dropbearkey
new file mode 100755
index 00000000..c472d0aa
Binary files /dev/null and b/src/os-plugins/plugins/dropbear/files/usr/bin/dropbearkey differ
diff --git a/src/os-plugins/plugins/dropbear/files/usr/sbin/dropbear b/src/os-plugins/plugins/dropbear/files/usr/sbin/dropbear
new file mode 100755
index 00000000..928f891c
Binary files /dev/null and b/src/os-plugins/plugins/dropbear/files/usr/sbin/dropbear differ
-- 
cgit v1.2.3-55-g7522