From 5ac8a35ffa7db1c1295f46c75e6b8cc7cd698546 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant+debianbugs@freegeek.org>
Date: Tue, 4 Sep 2007 10:41:07 +0200
Subject: initramfs-tools: split networking code into separate function

ltsp in ubuntu started using NBD+unionfs+squashfs instead of NFS, and
debian-live uses has a network boot methods using cifs in addition to a
different way of using NFS (i think it also uses unionfs and maybe
squashfs, not just a plain NFS/cifs mount)...

so splitting out the networking related code into a separate function
would move towards not having forked code for all of these different
network boot methods. at least, that's my hope.
---
 scripts/nfs | 33 ++-------------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

(limited to 'scripts/nfs')

diff --git a/scripts/nfs b/scripts/nfs
index 717dfe8..b9c2522 100644
--- a/scripts/nfs
+++ b/scripts/nfs
@@ -4,40 +4,11 @@
 
 retry_nr=0
 
-# parse nfs bootargs + launch ipconfig and nfsmount
+# parse nfs bootargs and mount nfs 
 do_nfsmount()
 {
-	# support ip options see linux sources Documentation/nfsroot.txt
-	case ${IPOPTS} in
-		none|off)
-			# Do nothing
-			;;
-		""|on|any)
-			# Bring up device
-			ipconfig ${DEVICE}
-			;;
-		dhcp|bootp|rarp|both)
-			ipconfig -c ${IPOPTS} -d ${DEVICE}
-			;;
-		*)
-			ipconfig -d $IPOPTS
 
-			# grab device entry from ip option
-			NEW_DEVICE=${IPOPTS#*:*:*:*:*:*}
-			if [ "${NEW_DEVICE}" != "${IPOPTS}" ]; then
-				NEW_DEVICE=${NEW_DEVICE%:*}
-			else
-				# wrong parse, possibly only a partial string
-				NEW_DEVICE=
-			fi
-			if [ -n "${NEW_DEVICE}" ]; then
-				DEVICE="${NEW_DEVICE}"
-			fi
-			;;
-	esac
-
-	# source relevant ipconfig output
-	. /tmp/net-${DEVICE}.conf
+	configure_networking
 
 	# get nfs root from dhcp
 	if [ "x${NFSROOT}" = "xauto" ]; then
-- 
cgit v1.2.3