summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 15:11:42 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:31:05 +0100
commit01ea1ef6fff0664f2de520d335bef22e137f42dc (patch)
tree1f9d5117b53215c6ae646444d0e9f795fbab9274 /scripts
parent86c5f2bf1bc193e5b1d5e42df5af6d86ffe5b6d4 (diff)
downloadlive-boot-01ea1ef6fff0664f2de520d335bef22e137f42dc.tar.gz
live-boot-01ea1ef6fff0664f2de520d335bef22e137f42dc.zip
Applied patch from Frederic Boiteux <fboiteux@calistel.com> about NFSROOT=auto, <http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-September/002173.html>.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/live b/scripts/live
index 7a0a78e..15d5dc8 100755
--- a/scripts/live
+++ b/scripts/live
@@ -585,17 +585,17 @@ do_netmount ()
ipconfig ${DEVICE} | tee /netboot.config
- if [ "${NFSROOT}" = "auto" ]
- then
- NFSROOT=${ROOTSERVER}:${ROOTPATH}
- fi
-
# source relevant ipconfig output
OLDHOSTNAME=$HOSTNAME
. /tmp/net-${DEVICE}.conf
[ -z $HOSTNAME ] && HOSTNAME=$OLDHOSTNAME
export HOSTNAME
+ if [ "${NFSROOT}" = "auto" ]
+ then
+ NFSROOT=${ROOTSERVER}:${ROOTPATH}
+ fi
+
if [ -n "${FETCH}" ] && do_httpmount
then
rc=0