From b22f2c7fc49c9874eb8f2df1d8b1fabec540cfb0 Mon Sep 17 00:00:00 2001
From: Jeff Bailey <jbailey@ubuntu.com>
Date: Fri, 17 Jun 2005 21:24:55 +0000
Subject: Make quieter, match mkinitrd interface, pull in dependencies for nfs
 and dhcp, document upstream repository location

---
 debian/changelog  | 17 +++++++++++++++++
 debian/copyright  |  7 +++++--
 init              |  2 +-
 mkinitramfs       | 22 +++++++++++++++++++++-
 scripts/functions |  8 ++++++--
 scripts/nfs       |  4 ++++
 6 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca4efc1..dfdbc50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+initramfs-tools (0.11) breezy; urgency=low
+
+  "Illusion is the first of all pleasures" - Oscar Wilde
+
+  * Make the init much less noisy
+
+  * Pull in all the dependancies for nfs and af_packet
+
+  * Be compatible with misdocumented mkinitrd interface
+
+  Thanks to Matt Zimmerman for the bug reports and testing!
+
+  * Update debian/copyright to have the location of the bzr
+    archive
+
+ -- Jeff Bailey <jbailey@ubuntu.com>  Fri, 17 Jun 2005 21:23:25 +0000
+
 initramfs-tools (0.10) breezy; urgency=low
 
   The "I can see you!" release.
diff --git a/debian/copyright b/debian/copyright
index cdc2919..a40b722 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,12 @@
-This package was debianized by Jeff Bailey <jbailey@raspberryginger.com> on
+This package was debianized by Jeff Bailey <jbailey@ubuntu.com> on
 Thu, 27 Jan 2005 15:23:52 -0500.
 
 Copyright:
 
-Author: Jeff Bailey, with some pieces for initrd-tools
+Author: Jeff Bailey <jbailey@ubuntu.com>
+
+The source code can be found by using "bzr" at:
+http://people.ubuntu.com/~jbailey/bzrtree/initramfs-tools
 
 License:
 
diff --git a/init b/init
index 52e10bd..8c5c53e 100644
--- a/init
+++ b/init
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 mkdir /sys
 mkdir /proc
diff --git a/mkinitramfs b/mkinitramfs
index 078346f..8ef22c4 100644
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -51,7 +51,7 @@ auto_add_modules()
 	copy_modules_dir kernel/fs/xfs
 
 	# These aren't caught by the above but really need to be there:
-	for x in mbcache; do
+	for x in mbcache nfs af_packet; do
 		for y in $(modprobe --set-version=${version} --show-depends ${x} | awk '{ print $2 }'); do
 			# Prune duplicates
 			if [ -e ${TMPDIR}/${y} ]; then
@@ -116,7 +116,27 @@ if [ x${outfile} = x ] || [ ${#} -ne 1 ]; then
 	usage
 fi
 
+# And by "version" we really mean path to kernel modules
+# This is braindead, and exists to preserve the interface with mkinitrd
 version=${1}
+[ $# -gt 0 ] || unset version
+case ${version} in
+/lib/modules/*/[!/]*)
+        ;;
+/lib/modules/[!/]*)
+        version=${version#/lib/modules/}
+        version=${version%%/*}
+        ;;
+esac
+
+case ${version} in
+*/*)
+        echo $PROG: ${version} is not a valid kernel version >&2
+        exit 1
+        ;;
+esac
+
+version="${version-$(uname -r)}"
 
 if [ -d ${outfile} ]; then
 	echo "${outfile} is a directory"
diff --git a/scripts/functions b/scripts/functions
index d5d1035..ab23352 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -111,14 +111,18 @@ load_modules()
 	depmod
 
 	for x in /sys/bus/pci/devices/*; do
-		modprobe -q $(cat ${x}/modalias)
+		if [ -e ${x}/modalias ]; then
+			modprobe -q $(cat ${x}/modalias)
+		fi
 	done
 
 	# Give the USB bus a moment to catch up
 	sleep 2
 
 	for x in /sys/bus/usb/devices/*; do
-		modprobe -q $(cat ${x}/modalias)
+		if [ -e ${x}/modalias ]; then
+			modprobe -q $(cat ${x}/modalias)
+		fi
 	done
 
 	# Load the modules
diff --git a/scripts/nfs b/scripts/nfs
index d8a259a..11c61f8 100644
--- a/scripts/nfs
+++ b/scripts/nfs
@@ -4,6 +4,10 @@ mountroot ()
 {
 	run_scripts /scripts/nfs-top
 
+	modprobe nfs
+	# For DHCP
+	modprobe af_packet
+
 	ipconfig ${DEVICE}
 	. /tmp/net-${DEVICE}.conf
 	if [ "x${NFSROOT}" = "xauto" ]; then
-- 
cgit v1.2.3