remove uclibc stuff - part II

8 files changed, 4 insertions, 6 deletions

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
--- a/src/os-plugins/plugins/dropbear/files/dropbearmulti
+++ /dev/null
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
--- /dev/null
+++ b/src/os-plugins/plugins/dropbear/files/lib/libcrypt.so.1
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
--- /dev/null
+++ b/src/os-plugins/plugins/dropbear/files/lib/libutil.so.1
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
--- /dev/null
+++ b/src/os-plugins/plugins/dropbear/files/usr/bin/dbclient
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
--- /dev/null
+++ b/src/os-plugins/plugins/dropbear/files/usr/bin/dropbearkey
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
--- /dev/null
+++ b/src/os-plugins/plugins/dropbear/files/usr/sbin/dropbear