View | Details | Raw Unified | Return to bug 212396
Collapse All | Expand All

(-)b/scripts/netconfig (-2 / +2 lines)
Lines 83-89 exec 3>&- Link Here
83 
IFCONFIG_PREFIX=""
 83 
IFCONFIG_PREFIX=""
84 
if is_wireless_if $INTERFACE; then
 84 
if is_wireless_if $INTERFACE; then
85 
	NEXT_WLAN_IFACE=wlan0	# XXX
 85 
	NEXT_WLAN_IFACE=wlan0	# XXX
86 
	echo wlans_$INTERFACE=\"$NEXT_WLAN_IFACE\" >> $BSDINSTALL_TMPETC/._rc.conf.net
 86 
	sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net wlans_$INTERFACE "$NEXT_WLAN_IFACE"
87 
	IFCONFIG_PREFIX="WPA "
 87 
	IFCONFIG_PREFIX="WPA "
88 
	if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
 88 
	if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
89 
		ifconfig $NEXT_WLAN_IFACE create wlandev $INTERFACE
 89 
		ifconfig $NEXT_WLAN_IFACE create wlandev $INTERFACE
Lines 117-123 fi Link Here
117 
# In case wlanconfig left an option and we do not support IPv4 we need to write
 117 
# In case wlanconfig left an option and we do not support IPv4 we need to write
118 
# it out on its own.  We cannot write it out with IPv6 as that suffix.
 118 
# it out on its own.  We cannot write it out with IPv6 as that suffix.
119 
if [ ${IPV4_AVAIL} -eq 0 -a -n ${IFCONFIG_PREFIX} ]; then
 119 
if [ ${IPV4_AVAIL} -eq 0 -a -n ${IFCONFIG_PREFIX} ]; then
120 
	echo ifconfig_${INTERFACE}=\"${IFCONFIG_PREFIX}\" >> $BSDINSTALL_TMPETC/._rc.conf.net
 120 
	sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net ifconfig_$INTERFACE "${IFCONFIG_PREFIX}"
121 
fi
 121 
fi
122 
if [ ${IPV6_AVAIL} -eq 1 ]; then
 122 
if [ ${IPV6_AVAIL} -eq 1 ]; then
123 
	bsddialog --backtitle "$OSNAME Installer" --title 'Network Configuration' \
 123 
	bsddialog --backtitle "$OSNAME Installer" --title 'Network Configuration' \
(-)b/scripts/netconfig_ipv4 (-1 / +1 lines)
Lines 66-72 if [ $? -eq $BSDDIALOG_OK ]; then Link Here
66 
			exec $0 ${INTERFACE} "${IFCONFIG_PREFIX}"
 66 
			exec $0 ${INTERFACE} "${IFCONFIG_PREFIX}"
67 
		fi
 67 
		fi
68 
	fi
 68 
	fi
69 
	echo ifconfig_$INTERFACE=\"${IFCONFIG_PREFIX}DHCP\" >> $BSDINSTALL_TMPETC/._rc.conf.net
 69 
	sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net ifconfig_$INTERFACE "${IFCONFIG_PREFIX}DHCP"
70 
	if [ $? -ne 0 ]; then
 70 
	if [ $? -ne 0 ]; then
71 
		bsddialog --backtitle "$OSNAME Installer" --title "Error" \
 71 
		bsddialog --backtitle "$OSNAME Installer" --title "Error" \
72 
		       --msgbox "Could not save the network configuration." 0 0
 72 
		       --msgbox "Could not save the network configuration." 0 0
(-)b/scripts/netconfig_ipv6 (-2 / +1 lines)
Lines 76-82 while : ; do Link Here
76 
				continue
 76 
				continue
77 
			fi
 77 
			fi
78 
		fi
 78 
		fi
79 
		echo ifconfig_${INTERFACE}_ipv6=\"inet6 accept_rtadv\" >> $BSDINSTALL_TMPETC/._rc.conf.net
 79 
		sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net ifconfig_${INTERFACE}_ipv6 "inet6 accept_rtadv"
80 
		if [ $? -ne 0 ]; then
 80 
		if [ $? -ne 0 ]; then
81 
			bsddialog --backtitle "$OSNAME Installer" --title "Error" \
 81 
			bsddialog --backtitle "$OSNAME Installer" --title "Error" \
82 
			       --msgbox "Could not save the network configuration." 0 0
 82 
			       --msgbox "Could not save the network configuration." 0 0
83 
-

Return to bug 212396