From 9cdfd735a8e330110d9c5bbde538460097813f4e Mon Sep 17 00:00:00 2001
From: Philippe Seewer <philippe.seewer@bfh.ch>
Date: Tue, 16 Jun 2009 10:46:30 +0200
Subject: [PATCH] netroot: Don't export NEWROOT

Exporting NEWROOT to handlers when we already pass them two other
arguments doesn't make sense. Passing it as a third argument is
better.
---
 modules.d/40network/netroot | 3 +--
 modules.d/95nbd/nbdroot     | 1 +
 modules.d/95nfs/nfsroot     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules.d/40network/netroot b/modules.d/40network/netroot
index d8747993..75313ba9 100755
--- a/modules.d/40network/netroot
+++ b/modules.d/40network/netroot
@@ -45,8 +45,7 @@ fi
 
 # Run the handler; don't store the root, it may change from device to device
 # XXX other variables to export?
-export NEWROOT
-if $handler $netif $netroot; then
+if $handler $netif $netroot $NEWROOT; then
     # Network rootfs mount successful
     [ -f /tmp/dhclient.$netif.lease ] &&    cp /tmp/dhclient.$netif.lease    /tmp/net.$netif.lease
     [ -f /tmp/dhclient.$netif.dhcpopts ] && cp /tmp/dhclient.$netif.dhcpopts /tmp/net.$netif.dhcpopts
diff --git a/modules.d/95nbd/nbdroot b/modules.d/95nbd/nbdroot
index b7f4cc40..2302696d 100755
--- a/modules.d/95nbd/nbdroot
+++ b/modules.d/95nbd/nbdroot
@@ -15,6 +15,7 @@ fi
 # root is in the form root=nbd:server:port:fstype:fsopts:nbdopts
 netif="$1"
 root="$2"
+NEWROOT="$3"
 
 root=${root#nbd:}
 nbdserver=${root%%:*}; root=${root#*:}
diff --git a/modules.d/95nfs/nfsroot b/modules.d/95nfs/nfsroot
index d0189be3..849fadf3 100755
--- a/modules.d/95nfs/nfsroot
+++ b/modules.d/95nfs/nfsroot
@@ -15,6 +15,7 @@ getarg rdnetdebug && {
 # root is in the form root=nfs[4]:server:path:[options]
 netif="$1"
 root="$2"
+NEWROOT="$3"
 
 nfsver=${root%%:*}; root=${root#*:}
 nfsserver=${root%%:*}; root=${root#*:}