From 3cec6bc98f6556c1ae50b74fc3c19171f19970ab Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Mon, 3 Jul 2006 13:37:01 +0000
Subject: Fixed a pcitable file related bug (for some reason the new version
 was not compatible), see HardwareErkennung too. Minor bugs for busybox
 integration fixed ...

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@265 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/mkdxsinitrd | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'initrd/mkdxsinitrd')

diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index 0f719e2e..6271fa01 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -159,7 +159,7 @@ else
         -e "s,@@@COMETCEXCL@@@,${COMETCEXCL},g" \
         -e "s,@@@DATE@@@,${DATE},g;/^#[^!].*/d" \
           initrd-stuff/${FILENAME} >> ${INSTDIR}/${FILENAME}
-    [ -n $use_busybox ] && sed -e "s,/bin/sh,/bin/ash," \
+    [ -x busybox -a "$use_busybox" = 1 ] && sed -e "s,^#!/bin/sh,#!/bin/ash," \
       -i ${INSTDIR}/${FILENAME}
   fi
 fi
@@ -419,7 +419,11 @@ mknod ${INSTDIR}/tmp/kmsg c 1 11 &>/dev/null
 mknod ${INSTDIR}/tmp/ctl b 241 255 &>/dev/null
 
 # test for the existance of busybox
-if [ -x busybox -a "$use_busybox" = 1 ] ; then
+[ -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" ] ; then
   cp busybox ${INSTDIR}/bin
   for bbins in [ arping ash cat chmod chown chroot cp date \
         dd df dmesg echo expr fdisk free hwclock insmod ip \
-- 
cgit v1.2.3-55-g7522