From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 4 Feb 2009 16:33:25 +0000 (+0100)
Subject: Enhanded mkinitramfs.
X-Git-Tag: v3.0-alpha1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bf81f836bcb6f8074b77807a8e9ec9c8e063e4a;p=ipfire-3.x.git

Enhanded mkinitramfs.
---

diff --git a/src/mkinitramfs/functions b/src/mkinitramfs/functions
index 7811cedde..23b59cd49 100644
--- a/src/mkinitramfs/functions
+++ b/src/mkinitramfs/functions
@@ -281,12 +281,23 @@ function locatemodule() {
 
 function installmodule() {
 	local module
+	local load
 	for module in $@; do
+		[ "$module" = "--load" ] && load=1
 		module=$(locatemodule $module)
 		[ -z "$module" ] && continue
 
 		install $module
 	done
+	if [ "$load" = "1" ]; then
+		for module in $@; do
+			[ "$module" = "--load" ] && continue
+			cat >> $TMPDIR/sbin/real-init <<EOF
+vecho "Loading module $i..."
+modprobe $i
+EOF
+		done
+	fi
 }
 
 resolve_device_name() {
@@ -384,17 +395,17 @@ findstoragedriverinsys () {
 	done
 	cd $(read_link ./device)
 	if echo $PWD | grep -q /virtio-pci/ ; then
-		installmodule virtio_pci
+		installmodule --load virtio_pci
 	fi
 	while [ "$PWD" != "/sys/devices" ]; do
 		deps=
 		if [ -f modalias ]; then
-			installmodule $(cat modalias)
+			installmodule --load $(cat modalias)
 		fi
 
 		[ -z "$deps" -a -L driver/module ] && \
 			deps=$(basename $(read_link driver/module))
-		installmodule $deps
+		installmodule --load $deps
 		cd ..
 	done
 }
@@ -480,7 +491,7 @@ mkdir -p bin sbin dev sys proc sysroot \
 
 # Install some essential binaries
 install bash chmod cat cut dd dmesg env grep kbd_mode kill killall5 ln ls lsmod mkdir \
-	mknod modprobe mount mountpoint openvt pidof rm sed setfont sh sleep switchroot \
+	mknod modprobe mount mountpoint openvt pidof ps rm sed setfont sh sleep switchroot \
 	udevadm udevd umount /lib/udev/console_init /lib/udev/vol_id
 
 # Copy modprobe.conf and friends over
@@ -489,6 +500,9 @@ for f in $(find /etc/modprobe.d -type f); do
 	install $f
 done
 
+# Install an empty fstab
+touch $TMPDIR/etc/fstab
+
 # terminfo bits make things work better if you fall into interactive mode
 [ -d "/usr/lib/terminfo" ] && \
 	for f in $(find /usr/lib/terminfo -type f); do
diff --git a/src/mkinitramfs/mkinitramfs b/src/mkinitramfs/mkinitramfs
index 6a195fd2e..6b14fab3c 100644
--- a/src/mkinitramfs/mkinitramfs
+++ b/src/mkinitramfs/mkinitramfs
@@ -19,11 +19,7 @@
 #                                                                             #
 ###############################################################################
 
-if [ -e "new-functions" ]; then
-	. new-functions
-else
-	. /usr/lib/mkinitramfs/functions
-fi
+. /usr/lib/mkinitramfs/functions
 
 # Add usb support
 MODULES="$MODULES ehci-hcd ohci-hcd uhci-hcd"
@@ -58,6 +54,22 @@ fi
 findstoragedriver ${rootdev##/dev/}
 
 cat >> sbin/real-init <<'EOF'
+
+# Users can override rootfs target on the kernel commandline
+for o in $(cat /proc/cmdline); do
+	case $o in
+	root=*)
+		rootdev=${o#root=}
+		;;
+	rootflags=*)
+		rootflags=${o#rootflags=}
+		;;
+	rootfstype=*)
+		rootfstype=${o#rootfstype=}
+		;;
+	esac
+done
+
 vecho "Starting udevd..."
 udevd --daemon
 
@@ -67,7 +79,7 @@ udevadm trigger
 vecho "Waiting for system to settle..."
 udevadm settle --timeout=30 || :
 
-vecho "Mounting root filesystem..."
+vecho "Mounting root filesystem $rootdev..."
 mount $rootdev /sysroot $rootfs $rootopts
 
 kill $(pidof udevd)
diff --git a/src/mkinitramfs/mkliveramfs b/src/mkinitramfs/mkliveramfs
index 53cdcacab..6bdc82d4b 100644
--- a/src/mkinitramfs/mkliveramfs
+++ b/src/mkinitramfs/mkliveramfs
@@ -19,11 +19,7 @@
 #                                                                             #
 ###############################################################################
 
-if [ -e "new-functions" ]; then
-	. new-functions
-else
-	. /usr/lib/mkinitramfs/functions
-fi
+. /usr/lib/mkinitramfs/functions
 
 # Modules needed by the live system
 MODULES="$MODULES aufs squashfs loop"