From 77178c0e39b8abd928296ec9985f13bc22b54ca7 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 19 Jul 2009 12:34:14 +0000
Subject: Modified uclibc-wrapper to be used in stage4 too (see r3017).

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3018 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 tools/uclibc-wrapper | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/uclibc-wrapper b/tools/uclibc-wrapper
index 3ee177c7..572bdb6c 100755
--- a/tools/uclibc-wrapper
+++ b/tools/uclibc-wrapper
@@ -1,14 +1,30 @@
-#!/bin/bash
+#!/bin/sh
+# Copyright (c) 2008..2009 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your feedback to feedback@openslx.org
+#
+# General information about OpenSLX can be found under http://openslx.org
+#
+# Wrapper script for OpenSLX environments used with server and client stage4 
 
 SLX_PATH=/opt/openslx/share
 SLX_UCLIB_PATH=$SLX_PATH/uclib-rootfs
 
-if [ -f $SLX_PATH ]; then
-  echo "Can't find OpenSLX Installation.." && exit 1
+if [ -f /opt/openslx/share/uclib-rootfs ]; then
+  SLX_UCLIB_PATH=/opt/openslx/share/uclib-rootfs
+elif [ -f /opt/openslx/uclib-rootfs ]; then
+  SLX_UCLIB_PATH=/opt/openslx/uclib-rootfs
+else
+  echo "Can't find OpenSLX Environment." && exit 1
 fi
 
 [ -f /lib/ld-uClibc.so.0 ] && ln -sf $SLX_PATH/uclib-rootfs/lib/ld-uClibc.so.0
 
-PATH=$SLX_UCLIB_PATH/bin:$SLX_UCLIB_PATH/usr/bin:$SLX_UCLIB_PATH/sbin:$SLX_UCLIB_PATH/usr/sbin
+PATH=$SLX_UCLIB_PATH/bin:$SLX_UCLIB_PATH/usr/bin:$SLX_UCLIB_PATH/sbin:\
+$SLX_UCLIB_PATH/usr/sbin
 LD_LIBRARY_PATH=$SLX_UCLIB_PATH/lib:$SLX_UCLIB_PATH/usr/lib 
 LD_LIBRARY_PATH=$LD_LIBRARY_PATH PATH=$PATH PS1="#" $@
-- 
cgit v1.2.3-55-g7522