From cb402f72e9a1e0ad2fe0f47da336a0b98dd17812 Mon Sep 17 00:00:00 2001
From: ajacoutot <>
Date: Fri, 5 Sep 2014 07:22:29 +0000
Subject: [PATCH] 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@
---
 src/etc/Makefile |  6 +++---
 src/etc/hosts    | 11 -----------
 src/etc/myname   |  1 -
 3 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 src/etc/hosts
 delete mode 100644 src/etc/myname

diff --git a/src/etc/Makefile b/src/etc/Makefile
index 111074a1..6ab8b7f4 100644
--- a/src/etc/Makefile
+++ b/src/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/src/etc/hosts b/src/etc/hosts
deleted file mode 100644
index 3fb2c2f0..00000000
--- a/src/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/src/etc/myname b/src/etc/myname
deleted file mode 100644
index cad21fe9..00000000
--- a/src/etc/myname
+++ /dev/null
@@ -1 +0,0 @@
-noname.my.domain