From 333765e767ca14365b8078598aee55bfb5a4db32 Mon Sep 17 00:00:00 2001
From: Jeff Bailey <jbailey@ubuntu.com>
Date: Thu, 16 Jun 2005 19:41:14 +0000
Subject: Require busybox-cvs-initramfs, include modprobe bits

---
 debian/changelog  |  8 ++++++++
 debian/control    |  2 +-
 init              |  9 ---------
 mkinitramfs       | 13 ++++++-------
 scripts/functions |  6 +-----
 5 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b96929f..88abe0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+initramfs-tools (0.9) breezy; urgency=low
+
+  * Unconditionally require busybox.  Might revert this eventually
+    but it's too much of a pain right now do this without
+    a reasonably environment.
+
+ -- Jeff Bailey <jbailey@ubuntu.com>  Thu, 16 Jun 2005 02:23:50 +0000
+
 initramfs-tools (0.8) breezy; urgency=low
 
   The "We are one in the spirit..." release
diff --git a/debian/control b/debian/control
index e2c4dbb..7222e98 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.6.1
 
 Package: initramfs-tools
 Architecture: all
-Depends: klibc-utils, busybox-cvs-static, mdadm
+Depends: klibc-utils, busybox-cvs-initramfs, mdadm
 Description: tools for generting an Ubuntu-style initramfs
  This package generates an initramfs for an Ubuntu system.
diff --git a/init b/init
index 31a16c0..a338889 100644
--- a/init
+++ b/init
@@ -1,14 +1,5 @@
 #!/bin/sh -x
 
-/bin/busybox ln -s /bin/busybox /bin/[
-/bin/busybox ln -s /bin/busybox /bin/basename
-/bin/busybox ln -s /bin/busybox /bin/mount
-/bin/busybox ln -s /bin/busybox /bin/mkdir
-/bin/busybox ln -s /bin/busybox /bin/umount
-/bin/busybox ln -s /bin/busybox /bin/sed
-/bin/busybox ln -s /bin/busybox /bin/grep
-/bin/busybox ln -s /bin/busybox /bin/cat
-
 mkdir /sys
 mkdir /proc
 mkdir /tmp
diff --git a/mkinitramfs b/mkinitramfs
index e1c9a6b..94cf4c5 100644
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -111,17 +111,16 @@ ln -s /lib/ld*.so.* ${TMPDIR}/lib
 rm ${TMPDIR}/lib/*lsb*
 
 # Busybox
-if [ "x${BUSYBOX}" = "xy" ]; then
-	rm ${TMPDIR}/bin/sh
-	ln -s /bin/busybox ${TMPDIR}/bin
-	ln -s /bin/busybox ${TMPDIR}/bin/sh
-fi
+rm ${TMPDIR}/bin/sh
+ln -s /usr/lib/initramfs-tools/bin/busybox ${TMPDIR}/bin/sh
+
+# Modutils
+ln -s /sbin/insmod ${TMPDIR}/bin
+ln -s /sbin/modprobe ${TMPDIR}/bin
 
 # Raid
 ln -s /sbin/mdadm ${TMPDIR}/bin
 ln -s /sbin/mdrun ${TMPDIR}/bin
-#ln -s /bin/grep ${TMPDIR}/bin
-#ln -s /bin/sed ${TMPDIR}/bin
 
 (cd ${TMPDIR} && find . | cpio --quiet --dereference -o -H newc | gzip -9 >${outfile})
 
diff --git a/scripts/functions b/scripts/functions
index a2ffd54..717418f 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -1,11 +1,7 @@
 panic()
 {
 	echo $@
-	if [ -e /bin/busybox ]; then
-		FS1='(initramfs) ' exec /bin/busybox sh
-	else
-		FS1='(initramfs) ' exec /bin/sh
-	fi
+	FS1='(initramfs) ' exec /bin/sh
 }
 
 render()
-- 
cgit v1.2.3