Date: Mon, 4 Aug 2014 19:11:40 GMT From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r271864 - in soc2014/kczekirda/pxe-fai-head: head/usr.sbin/bsdinstall/scripts others Message-ID: <201408041911.s74JBeV8006251@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kczekirda Date: Mon Aug 4 19:11:40 2014 New Revision: 271864 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271864 Log: ipv4 tofile Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 soc2014/kczekirda/pxe-fai-head/others/template.input Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig ============================================================================== --- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig Mon Aug 4 19:11:34 2014 (r271863) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig Mon Aug 4 19:11:40 2014 (r271864) @@ -69,7 +69,11 @@ if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi exec 3>&- -: > $BSDINSTALL_TMPETC/._rc.conf.net +if [ -z "$TOFILE"]; then + : > $BSDINSTALL_TMPETC/._rc.conf.net +else + echo INTERFACE=\"$INTERFACE\" >> "$TOFILE" +fi IFCONFIG_PREFIX="" if is_wireless_if $INTERFACE; then Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 ============================================================================== --- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 Mon Aug 4 19:11:34 2014 (r271863) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 Mon Aug 4 19:11:40 2014 (r271864) @@ -48,7 +48,11 @@ dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' --yesno 'Would you like to use DHCP to configure this interface?' 0 0 if [ $? -eq $DIALOG_OK ]; then - echo ifconfig_$INTERFACE=\"${IFCONFIG_PREFIX}DHCP\" >> $BSDINSTALL_TMPETC/._rc.conf.net + if [ -z "$TOFILE" ]; then + echo ifconfig_$INTERFACE=\"${IFCONFIG_PREFIX}DHCP\" >> $BSDINSTALL_TMPETC/._rc.conf.net + else + echo DHCP=\"YES\" >> "$TOFILE" + fi if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then dialog --backtitle 'FreeBSD Installer' --infobox "Acquiring DHCP lease..." 0 0 @@ -75,11 +79,19 @@ if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi exec 3>&- -echo $INTERFACE $IF_CONFIG | - awk -v prefix="$IFCONFIG_PREFIX" '{ - printf("ifconfig_%s=\"%s\inet %s netmask %s\"\n", $1, prefix, $2, $3); - printf("defaultrouter=\"%s\"\n", $4); - }' >> $BSDINSTALL_TMPETC/._rc.conf.net +if [ -z "$TOFILE" ]; then + echo $INTERFACE $IF_CONFIG | + awk -v prefix="$IFCONFIG_PREFIX" '{ + printf("ifconfig_%s=\"%s\inet %s netmask %s\"\n", $1, prefix, $2, $3); + printf("defaultrouter=\"%s\"\n", $4); + }' >> $BSDINSTALL_TMPETC/._rc.conf.net +else + echo $IF_CONFIG | + awk '{printf("ADDRESSV4=\"%s\"\n", $1); + printf("NETMASK=\"%s\"\n", $2); + printf("GWV4=\"%s\"\n", $3); + }' >> "$TOFILE" +fi if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then . $BSDINSTALL_TMPETC/._rc.conf.net Modified: soc2014/kczekirda/pxe-fai-head/others/template.input ============================================================================== --- soc2014/kczekirda/pxe-fai-head/others/template.input Mon Aug 4 19:11:34 2014 (r271863) +++ soc2014/kczekirda/pxe-fai-head/others/template.input Mon Aug 4 19:11:40 2014 (r271864) @@ -6,16 +6,14 @@ TIMEZONE="Europe/Warsaw" DAEMONS="sshd dumpdev" DISTRIBUTIONS="kernel.txz base.txz" - -ZFSBOOT="YES" -ZFSPRESSED="/root/zfspressed" -#PARTITIONS="ada1 { auto freebsd-ufs /}" INTERFACE="em0" IPV4="YES" DHCP="NO" -#ADDRESSV4="192.168.1.254" -#NETMASK="255.255.255.0" -#GWV4="192.168.1.1" +ADDRESSV4="192.168.1.254" +NETMASK="255.255.255.0" +GWV4="192.168.1.1" + + #DOMAIN="example.com" #DNS1V4="194.204.159.1" #DNS2V4="8.8.8.8" @@ -26,6 +24,10 @@ #GWV6="2001:db8:4672:6565::1" #DNS1V6="2001:4860:4860::8888" #DNS2V6="2001:4860:4860::8844" + +PARTITIONS="ada1 { auto freebsd-ufs /}" +ZFSBOOT="YES" +ZFSPRESSED="/root/zfspressed" #ROOTPWHASH='$6$Qb2inVrU65.r4Dx5$DaHdU2P1ipFMLZ8J5xJk8DDtC88rE87qo7du6CBvNgyit8RezQ2qkPe83X4KgTCTEtXGrMaMKZ1.W4xg1yz0z/' #USERS="/etc/usersconfig"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408041911.s74JBeV8006251>