diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2001-03-02 08:15:41 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2001-03-02 08:15:41 +0000 |
| commit | 8ca420e7fa4d184ca25018ca0276a0ddebbc45d3 (patch) | |
| tree | 961b5a1f3633750623b9d0e1301a61905fc62d46 | |
| parent | e6959b888b1d80b1750ae3cff54a21c813ff367e (diff) | |
| download | src-8ca420e7fa4d184ca25018ca0276a0ddebbc45d3.tar.gz src-8ca420e7fa4d184ca25018ca0276a0ddebbc45d3.zip | |
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.
Notes
Notes:
svn path=/head/; revision=73322
| -rw-r--r-- | usr.sbin/sade/sade.h | 1 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/sysinstall.h | 1 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/tcpip.c | 9 |
3 files changed, 0 insertions, 11 deletions
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index ecbbfc1b129e..a489b857843c 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -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" diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index ecbbfc1b129e..a489b857843c 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -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" diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c index f466bfe8f9a9..1be52391c9a9 100644 --- a/usr.sbin/sysinstall/tcpip.c +++ b/usr.sbin/sysinstall/tcpip.c @@ -515,7 +515,6 @@ netconfig: if (!cancel) { DevInfo *di; char temp[512], ifn[255]; - char *ifaces; char *pccard; int ipv4_enable = FALSE; @@ -558,14 +557,6 @@ netconfig: 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) |