svn commit: r196647 - in stable/6/etc: . bluetooth defaults
etc.alpha etc.amd64 etc.arm etc.i386 etc.ia64 etc.powerpc
etc.sparc64 isdn mail mtree namedb pam.d periodic ppp rc.d
root sendmail
Doug Barton
dougb at FreeBSD.org
Sat Aug 29 19:49:18 UTC 2009
Author: dougb
Date: Sat Aug 29 19:49:17 2009
New Revision: 196647
URL: http://svn.freebsd.org/changeset/base/196647
Log:
MFC 196478:
Prior to the dire warning about values of network_interfaces other than
AUTO the biggest mistake users made was leaving lo0 off the list. Since
lo0 is effectively mandatory, check for it and add it to the list if
it's not there.
MFC 196523:
Improve the case test to detect the presence of lo0 in the list of
network_interfaces.
Submitted by: Christoph Mallon <christoph.mallon at gmx.de>
Modified:
stable/6/etc/ (props changed)
stable/6/etc/Makefile (props changed)
stable/6/etc/amd.map (props changed)
stable/6/etc/apmd.conf (props changed)
stable/6/etc/auth.conf (props changed)
stable/6/etc/bluetooth/ (props changed)
stable/6/etc/crontab (props changed)
stable/6/etc/csh.cshrc (props changed)
stable/6/etc/csh.login (props changed)
stable/6/etc/csh.logout (props changed)
stable/6/etc/defaults/ (props changed)
stable/6/etc/devd.conf (props changed)
stable/6/etc/devfs.conf (props changed)
stable/6/etc/dhclient.conf (props changed)
stable/6/etc/disktab (props changed)
stable/6/etc/etc.alpha/ (props changed)
stable/6/etc/etc.amd64/ (props changed)
stable/6/etc/etc.arm/ (props changed)
stable/6/etc/etc.i386/ (props changed)
stable/6/etc/etc.ia64/ (props changed)
stable/6/etc/etc.powerpc/ (props changed)
stable/6/etc/etc.sparc64/ (props changed)
stable/6/etc/fbtab (props changed)
stable/6/etc/freebsd-update.conf (props changed)
stable/6/etc/ftpusers (props changed)
stable/6/etc/gettytab (props changed)
stable/6/etc/group (props changed)
stable/6/etc/hosts (props changed)
stable/6/etc/hosts.allow (props changed)
stable/6/etc/hosts.equiv (props changed)
stable/6/etc/hosts.lpd (props changed)
stable/6/etc/inetd.conf (props changed)
stable/6/etc/isdn/ (props changed)
stable/6/etc/login.access (props changed)
stable/6/etc/login.conf (props changed)
stable/6/etc/mac.conf (props changed)
stable/6/etc/mail/ (props changed)
stable/6/etc/man.alias (props changed)
stable/6/etc/master.passwd (props changed)
stable/6/etc/minfree (props changed)
stable/6/etc/motd (props changed)
stable/6/etc/mtree/ (props changed)
stable/6/etc/namedb/ (props changed)
stable/6/etc/netconfig (props changed)
stable/6/etc/netstart (props changed)
stable/6/etc/network.subr (contents, props changed)
stable/6/etc/networks (props changed)
stable/6/etc/newsyslog.conf (props changed)
stable/6/etc/nls.alias (props changed)
stable/6/etc/nsmb.conf (props changed)
stable/6/etc/opieaccess (props changed)
stable/6/etc/pam.d/ (props changed)
stable/6/etc/pccard_ether (props changed)
stable/6/etc/periodic/ (props changed)
stable/6/etc/pf.conf (props changed)
stable/6/etc/pf.os (props changed)
stable/6/etc/phones (props changed)
stable/6/etc/portsnap.conf (props changed)
stable/6/etc/ppp/ (props changed)
stable/6/etc/printcap (props changed)
stable/6/etc/profile (props changed)
stable/6/etc/protocols (props changed)
stable/6/etc/rc (props changed)
stable/6/etc/rc.bsdextended (props changed)
stable/6/etc/rc.d/ (props changed)
stable/6/etc/rc.firewall (props changed)
stable/6/etc/rc.firewall6 (props changed)
stable/6/etc/rc.initdiskless (props changed)
stable/6/etc/rc.resume (props changed)
stable/6/etc/rc.sendmail (props changed)
stable/6/etc/rc.shutdown (props changed)
stable/6/etc/rc.subr (props changed)
stable/6/etc/rc.suspend (props changed)
stable/6/etc/remote (props changed)
stable/6/etc/root/ (props changed)
stable/6/etc/rpc (props changed)
stable/6/etc/sendmail/ (props changed)
stable/6/etc/services (props changed)
stable/6/etc/shells (props changed)
stable/6/etc/snmpd.config (props changed)
stable/6/etc/sysctl.conf (props changed)
stable/6/etc/syslog.conf (props changed)
stable/6/etc/termcap.small (props changed)
stable/6/etc/usbd.conf (props changed)
Modified: stable/6/etc/network.subr
==============================================================================
--- stable/6/etc/network.subr Sat Aug 29 19:47:39 2009 (r196646)
+++ stable/6/etc/network.subr Sat Aug 29 19:49:17 2009 (r196647)
@@ -583,6 +583,13 @@ list_net_interfaces()
"AUTO are deprecated"
fi
_tmplist="${network_interfaces} ${cloned_interfaces}"
+
+ # lo0 is effectively mandatory, so help prevent foot-shooting
+ #
+ case "$_tmplist" in
+ lo0|'lo0 '*|*' lo0'|*' lo0 '*) ;; # This is fine, do nothing
+ *) _tmplist="lo0 ${_tmplist}" ;;
+ esac
;;
esac
More information about the svn-src-stable
mailing list