Ack! I finally got annoyed enough to actually kill this. There is no

need to manually force the network_interfaces variable in /etc/rc.conf,
and it only ever gets in the way.  rc.network and rc.network6 DTRT with
the default of 'auto'.  This should have died over a year ago.
This commit is contained in:
Peter Wemm 2001-03-02 08:15:41 +00:00
parent e6959b888b
commit 8ca420e7fa
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=73322
3 changed files with 0 additions and 11 deletions

View File

@ -120,7 +120,6 @@
#define VAR_GEOMETRY "geometry"
#define VAR_HOSTNAME "hostname"
#define VAR_IFCONFIG "ifconfig_"
#define VAR_INTERFACES "network_interfaces"
#define VAR_INSTALL_CFG "installConfig"
#define VAR_INSTALL_ROOT "installRoot"
#define VAR_IPADDR "ipaddr"

View File

@ -120,7 +120,6 @@
#define VAR_GEOMETRY "geometry"
#define VAR_HOSTNAME "hostname"
#define VAR_IFCONFIG "ifconfig_"
#define VAR_INTERFACES "network_interfaces"
#define VAR_INSTALL_CFG "installConfig"
#define VAR_INSTALL_ROOT "installRoot"
#define VAR_IPADDR "ipaddr"

View File

@ -515,7 +515,6 @@ tcpOpenDialog(Device *devp)
if (!cancel) {
DevInfo *di;
char temp[512], ifn[255];
char *ifaces;
char *pccard;
int ipv4_enable = FALSE;
@ -558,14 +557,6 @@ tcpOpenDialog(Device *devp)
if (pccard && strcmp(pccard, "YES") == 0 && ipv4_enable) {
variable_set2("pccard_ifconfig", temp, 1);
}
ifaces = variable_get(VAR_INTERFACES);
if (!ifaces)
variable_set2(VAR_INTERFACES, ifaces = "lo0", 1);
/* Only add it if it's not there already */
if (strcmp(ifaces, "auto") && !strstr(ifaces, devp->name)) {
sprintf(ifn, "%s %s", devp->name, ifaces);
variable_set2(VAR_INTERFACES, ifn, 1);
}
if (use_rtsol)
variable_set2(VAR_IPV6_ENABLE, "YES", 1);
if (!use_dhcp)