summaryrefslogtreecommitdiffstats
path: root/initrd/mkdxsinitrd
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-07-03 22:27:23 +0200
committerDirk von Suchodoletz2006-07-03 22:27:23 +0200
commit343d0f3d0efaf486ddc676130786d95fc06f682c (patch)
tree4f036b493d07325cdfa748fa558916311438ca5c /initrd/mkdxsinitrd
parentJust check in - do not use this version. (diff)
downloadcore-343d0f3d0efaf486ddc676130786d95fc06f682c.tar.gz
core-343d0f3d0efaf486ddc676130786d95fc06f682c.tar.xz
core-343d0f3d0efaf486ddc676130786d95fc06f682c.zip
Enhanced debugging settings (see DebugLevel), some fixes for the use
with busybox, ... git-svn-id: http://svn.openslx.org/svn/openslx/ld4@267 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/mkdxsinitrd')
-rwxr-xr-xinitrd/mkdxsinitrd14
1 files changed, 9 insertions, 5 deletions
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index 6271fa01..aed9345e 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -3,7 +3,7 @@
# Description: universal (distro independent) generator for initial
# ramdisks for linux diskless clients
#
-# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 01-07-2006
+# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 03-07-2006
# Nico Dietrich
# Felix Endres
#
@@ -419,10 +419,12 @@ mknod ${INSTDIR}/tmp/kmsg c 1 11 &>/dev/null
mknod ${INSTDIR}/tmp/ctl b 241 255 &>/dev/null
# test for the existance of busybox
-[ -x busybox -a "$use_busybox" = 1 ] || {
- unset use_busybox
- echo "You wanted to include busybox, but did not provide it in \
-initrd/ directory."; }
+if [ "$use_busybox" = 1 ]; then
+ [ -x busybox ] || {
+ unset use_busybox
+ echo "You wanted to include busybox, but did not provide it in \
+ initrd/ directory."; }
+fi
if [ "$use_busybox" ] ; then
cp busybox ${INSTDIR}/bin
for bbins in [ arping ash cat chmod chown chroot cp date \
@@ -433,6 +435,8 @@ if [ "$use_busybox" ] ; then
umount uname usleep vconfig vi; do
ln -s /bin/busybox ${INSTDIR}/bin/$bbins
done
+ echo -e "#!/bin/ash\n/bin/ash $@" > ${INSTDIR}/bin/sh
+ chmod a+x ${INSTDIR}/bin/sh
else
# find and copy a shell to be used within initialramfs
for bbins in bash ash sh; do