SVN: geninitrd/trunk/geninitrd

[adamg]

Author: adamg
Date: Mon May 26 20:58:39 2008
New Revision: 9777

Modified:
   geninitrd/trunk/geninitrd
Log:
- small optimization - less add_linuxrc() calls in initrd_gen_nfs()

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Mon May 26 20:58:39 2008
@@ -1363,10 +1363,17 @@
 	debug "Adding rootfs on NFS support to initrd (dhcp)"
 	mknod "$DESTDIR/dev/urandom" c 1 9
 	mkdir "$DESTDIR/newroot"
-	echo "ifconfig lo 127.0.0.1 up" | add_linuxrc
-	echo "route add -net 127.0.0.0 netmask 255.0.0.0 lo" | add_linuxrc
-	echo "ifconfig eth0 0.0.0.0 up" | add_linuxrc
-	echo "udhcpc -i eth0 -f -q -s /bin/setdhcp" | add_linuxrc
+	add_linuxrc <<-'EOF'
+		ifconfig lo 127.0.0.1 up
+		route add -net 127.0.0.0 mask 255.0.0.0 lo
+		ifconfig eth0 up
+		udhcpc -i eth0 -f -q -s /bin/setdhcp
+
+		cd /newroot
+		pivot_root . initrd
+		[ -x /sbin/chroot ] && exec /sbin/chroot . /sbin/init -i < dev/console > dev/console 2>&1
+		exec /usr/sbin/chroot . /sbin/init -i < dev/console > dev/console 2>&1
+	EOF
 
 	cat <<-'EOF' > "$DESTDIR/bin/setdhcp"
 		#!/bin/sh
@@ -1398,12 +1405,6 @@
 	EOF
 
 	chmod 755 "$DESTDIR/bin/setdhcp"
-	add_linuxrc <<-'EOF'
-		cd /newroot
-		pivot_root . initrd
-		[ -x /sbin/chroot ] && exec /sbin/chroot . /sbin/init -i < dev/console > dev/console 2>&1
-		exec /usr/sbin/chroot . /sbin/init -i < dev/console > dev/console 2>&1
-	EOF
 }
 
 initrd_gen_lvm() {