summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2014-09-05 07:22:30 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2014-09-05 07:22:30 +0000
commit9af42551f3f25b17e8b8182a34d4cbb1a9accc3a (patch)
tree77478738f9ebe4908f84906aa10424b61251ebbc /etc
parent085c01176f7e1f4b822d5c45c6c95aa5e83c869c (diff)
Remove /etc/{hosts,myname} from etc.tgz.
Make the installer create the /etc/hosts template. While here, re-add a missing 'echo' from install.sh. ok miod@ krw@ halex@
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile6
-rw-r--r--etc/hosts11
-rw-r--r--etc/myname1
3 files changed, 3 insertions, 15 deletions
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