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

[kczekirda at FreeBSD.org]

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

Log:
  dhcp

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:07:59 2014	(r268926)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Sun Jun  1 20:08:04 2014	(r268927)
@@ -38,6 +38,7 @@
 ############################################################ CONFIGURATION
 
 # VARIABLES:
+
 # PARTITIONS
 # DISTRIBUTIONS
 # BSDINSTALL_DISTDIR
@@ -51,15 +52,20 @@
 # KEYMAP	to TMPETC if not exist, don't set
 # DAEMONS	to TMPETC if not exist, set only sshd
 # TIMEZONE	to /tmp/bsdinstall-installscript-ab
-
-# TODO: network, users,
-# VARIABLES:
-# INTERFACE (em0, bge0)
-# IPV4 (default: YES)
-# DHCP (default: YES)
+# INTERFACE 	(em0, bge0)
+# IPV4 		(default: YES)
+: ${IPV4:=YES}
+# DHCP 		(default: YES)
+: ${DHCP:=YES}
 # ADDRESSV4
 # NETMASK
 # GWV4
+# DOMAIN
+# DNS1V4
+# DNS2V4
+
+# TODO: network, users,
+# VARIABLES:
 # IPV6 (default: NO)
 # SLAAC (default: YES)
 # ADDRESSV6
@@ -161,6 +167,18 @@
 
 # Network
 
+if [ -n "$INTERFACE" ] && [ -n "$IPV4" ]; then
+	if [ "$DHCP" = "YES" ]; then
+		echo "ifconfig_$INTERFACE=\"DHCP\"" >> $BSDINSTALL_TMPETC/rc.conf.network
+	fi
+fi
+
+# ADDRESSV4
+# NETMASK
+# GWV4
+# DOMAIN
+# DNS1V4
+# DNS2V4
 
 # Make partitions
 rm -f $PATH_FSTAB
@@ -190,9 +208,9 @@
 bsdinstall config
 
 # Make sure networking is functional, if we can arrange that
-if [ ! -f $BSDINSTALL_CHROOT/etc/resolv.conf -a -f /etc/resolv.conf ]; then
-	cp /etc/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf
-fi
+#if [ ! -f $BSDINSTALL_CHROOT/etc/resolv.conf -a -f /etc/resolv.conf ]; then
+#	cp /etc/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf
+#fi
 
 # Run post-install script
 if [ -f /tmp/bsdinstall-installscript-ab ]; then