socsvn commit: r268931 - soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts

[kczekirda at FreeBSD.org]

Author: kczekirda
Date: Sun Jun  1 20:08:21 2014
New Revision: 268931
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268931

Log:
  network configuration after mount BSDINSTALL_CHROOT directory

Modified:
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Sun Jun  1 20:08:17 2014	(r268930)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Sun Jun  1 20:08:21 2014	(r268931)
@@ -70,9 +70,6 @@
 # SLAAC (default: YES)
 # ADDRESSV6
 # GWV6
-# DOMAIN
-# DNS1V4
-# DNS2V4
 # DNS1V6
 # DNS2V6
 
@@ -165,22 +162,6 @@
         echo "tzsetup \"$TIMEZONE\"" >> /tmp/bsdinstall-installscript-ab 
 fi
 
-# Network
-
-if [ -n "$INTERFACE" ] && [ -n "$IPV4" ]; then
-	if [ "$DHCP" = "YES" ]; then
-		echo "ifconfig_$INTERFACE=\"DHCP\"" >> $BSDINSTALL_TMPETC/rc.conf.network
-	fi
-
-	if [ "$DHCP" = "NO" ]; then
-		echo "ifconfig_$INTERFACE=\"inet $ADDRESSV4 netmask $NETMASK\"" >> $BSDINSTALL_TMPETC/rc.conf.network
-		echo "defaultrouter=\"$GWV4\"" >> $BSDINSTALL_TMPETC/rc.conf.network
-		echo "domain $DOMAIN" >> $BSDINSTALL_CHROOT/etc/resolv.conf
-		echo "nameserver $DNS1V4" >> $BSDINSTALL_CHROOT/etc/resolv.conf
-		echo "nameserver $DNS2V4" >> $BSDINSTALL_CHROOT/etc/resolv.conf
-	fi
-fi
-
 # Make partitions
 rm -f $PATH_FSTAB
 touch $PATH_FSTAB
@@ -191,6 +172,24 @@
 fi
 bsdinstall mount
 
+# Network
+
+if [ -n "$INTERFACE" ] && [ -n "$IPV4" ]; then
+        if [ "$DHCP" = "YES" ]; then
+                echo "ifconfig_$INTERFACE=\"DHCP\"" >> $BSDINSTALL_TMPETC/rc.conf.network
+        fi
+
+        if [ "$DHCP" = "NO" ]; then
+                echo "ifconfig_$INTERFACE=\"inet $ADDRESSV4 netmask $NETMASK\"" >> $BSDINSTALL_TMPETC/rc.conf.network
+                echo "defaultrouter=\"$GWV4\"" >> $BSDINSTALL_TMPETC/rc.conf.network
+                echo "domain $DOMAIN" >> $BSDINSTALL_CHROOT/etc/resolv.conf
+                echo "nameserver $DNS1V4" >> $BSDINSTALL_CHROOT/etc/resolv.conf
+                echo "nameserver $DNS2V4" >> $BSDINSTALL_CHROOT/etc/resolv.conf
+        fi
+fi
+
+
+
 # Fetch distributions
 
 BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist"