diff options
| -rw-r--r-- | distrib/miniroot/install.sh | 10 | ||||
| -rw-r--r-- | distrib/sets/lists/etc/mi | 2 | ||||
| -rw-r--r-- | etc/Makefile | 6 | ||||
| -rw-r--r-- | etc/hosts | 11 | ||||
| -rw-r--r-- | etc/myname | 1 |
5 files changed, 11 insertions, 19 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index 8d126463ced..df682a99585 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.257 2014/08/27 14:04:15 florian Exp $ +# $OpenBSD: install.sh,v 1.258 2014/09/05 07:22:29 ajacoutot Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -244,7 +244,11 @@ hostname >/tmp/myname # Append entries to installed hosts file, changing '1.2.3.4 hostname' # to '1.2.3.4 hostname.$FQDN hostname'. Leave untouched lines containing # domain information or aliases. These are lines the user added/changed -# manually. Note we may have no hosts file if no interfaces were configured. +# manually. +# Add common entries. +echo "127.0.0.1\tlocalhost" >/mnt/etc/hosts +echo "::1\t\tlocalhost" >>/mnt/etc/hosts +# Note we may have no hosts file if no interfaces were configured. if [[ -f /tmp/hosts ]]; then _dn=$(get_fqdn) while read _addr _hn _aliases; do @@ -268,6 +272,8 @@ _f=dhclient.conf [[ -f $_f && -s $_f ]] && mv $_f /mnt/etc/. done) +echo "done." + apply if [[ -n $user ]]; then diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi index 7aa55ebdc24..bc189661902 100644 --- a/distrib/sets/lists/etc/mi +++ b/distrib/sets/lists/etc/mi @@ -9,7 +9,6 @@ ./etc/ftpusers ./etc/gettytab ./etc/group -./etc/hosts ./etc/ksh.kshrc ./etc/localtime ./etc/locate.rc @@ -38,7 +37,6 @@ ./etc/man.conf ./etc/master.passwd ./etc/motd -./etc/myname ./etc/newsyslog.conf ./etc/npppd/npppd-users ./etc/npppd/npppd.conf diff --git a/etc/Makefile b/etc/Makefile index 111074a100b..6ab8b7f4af3 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.392 2014/08/29 18:05:39 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.393 2014/09/05 07:22:29 ajacoutot Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -32,8 +32,8 @@ BINOWN= root BINGRP= wheel MUTABLE=changelist csh.cshrc csh.login csh.logout daily \ etc.${MACHINE}/disktab etc.${MACHINE}/login.conf ftpusers \ - gettytab group hosts ksh.kshrc locate.rc mailer.conf man.conf \ - moduli monthly myname netstart networks newsyslog.conf \ + gettytab group ksh.kshrc locate.rc mailer.conf man.conf \ + moduli monthly netstart networks newsyslog.conf \ pf.os protocols rc rc.conf rpc services shells syslog.conf weekly # -rw-r--r-- diff --git a/etc/hosts b/etc/hosts deleted file mode 100644 index 3fb2c2f02de..00000000000 --- a/etc/hosts +++ /dev/null @@ -1,11 +0,0 @@ -# $OpenBSD: hosts,v 1.12 2009/03/10 00:42:13 deraadt Exp $ -# -# Host Database -# -# RFC 1918 specifies that these networks are "internal". -# 10.0.0.0 10.255.255.255 -# 172.16.0.0 172.31.255.255 -# 192.168.0.0 192.168.255.255 -# -127.0.0.1 localhost -::1 localhost diff --git a/etc/myname b/etc/myname deleted file mode 100644 index cad21fe9205..00000000000 --- a/etc/myname +++ /dev/null @@ -1 +0,0 @@ -noname.my.domain |