| netconfig (222619) | netconfig (222681) |
|---|---|
| 1#!/bin/sh 2#- 3# Copyright (c) 2011 Nathan Whitehorn 4# All rights reserved. 5# Copyright (c) 2011 The FreeBSD Foundation 6# All rights reserved. 7# 8# Portions of this software were developed by Bjoern Zeeb --- 15 unchanged lines hidden (view full) --- 24# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 25# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 26# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 27# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30# SUCH DAMAGE. 31# | 1#!/bin/sh 2#- 3# Copyright (c) 2011 Nathan Whitehorn 4# All rights reserved. 5# Copyright (c) 2011 The FreeBSD Foundation 6# All rights reserved. 7# 8# Portions of this software were developed by Bjoern Zeeb --- 15 unchanged lines hidden (view full) --- 24# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 25# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 26# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 27# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30# SUCH DAMAGE. 31# |
| 32# $FreeBSD: head/usr.sbin/bsdinstall/scripts/netconfig 222619 2011-06-02 14:25:27Z bz $ | 32# $FreeBSD: head/usr.sbin/bsdinstall/scripts/netconfig 222681 2011-06-04 12:51:22Z bz $ |
| 33 34INTERFACES="" 35DIALOG_TAGS="" 36 37: ${DIALOG_OK=0} 38: ${DIALOG_CANCEL=1} 39: ${DIALOG_HELP=2} 40: ${DIALOG_EXTRA=3} --- 127 unchanged lines hidden (view full) --- 168 --mixedform 'Resovler Configuration' 0 0 0 \ 1692>&1 1>&3) 170if [ $? -eq $DIALOG_CANCEL ]; then exec $0; fi 171exec 3>&- 172 173echo ${RESOLV} | tr ' ' '\n' | \ 174awk ' 175BEGIN { | 33 34INTERFACES="" 35DIALOG_TAGS="" 36 37: ${DIALOG_OK=0} 38: ${DIALOG_CANCEL=1} 39: ${DIALOG_HELP=2} 40: ${DIALOG_EXTRA=3} --- 127 unchanged lines hidden (view full) --- 168 --mixedform 'Resovler Configuration' 0 0 0 \ 1692>&1 1>&3) 170if [ $? -eq $DIALOG_CANCEL ]; then exec $0; fi 171exec 3>&- 172 173echo ${RESOLV} | tr ' ' '\n' | \ 174awk ' 175BEGIN { |
| 176 search=1 177 printf "search "; | 176 search=-1; |
| 178} 179{ 180 if (/^[[:space:]]+$/) { 181 next; 182 } 183 if (/^Nameserver$/) { 184 printf "\n"; 185 search=0; 186 next; 187 } | 177} 178{ 179 if (/^[[:space:]]+$/) { 180 next; 181 } 182 if (/^Nameserver$/) { 183 printf "\n"; 184 search=0; 185 next; 186 } |
| 187 if (search == -1) { 188 printf "search "; 189 search=1; 190 } |
|
| 188 if (search > 0) { | 191 if (search > 0) { |
| 189 printf "%s%s", (search > 1) ? "," : "", $1; | 192 printf "%s%s", (search > 1) ? " " : "", $1; 193 search++; |
| 190 next; 191 } 192 printf "nameserver %s\n", $1; 193}' > ${BSDINSTALL_TMPETC}/resolv.conf 194 195mv $BSDINSTALL_TMPETC/._rc.conf.net $BSDINSTALL_TMPETC/rc.conf.net | 194 next; 195 } 196 printf "nameserver %s\n", $1; 197}' > ${BSDINSTALL_TMPETC}/resolv.conf 198 199mv $BSDINSTALL_TMPETC/._rc.conf.net $BSDINSTALL_TMPETC/rc.conf.net |