summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2004-12-19 15:37:59 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2004-12-19 15:37:59 +0000
commit841a14b61ad978b554ba5d007ebea2e72aef8886 (patch)
treeb86768b4e8ccd5dae16ffc731fd7b88256f96ee8 /etc
parent867f30cf0374af3462a7f822368021a6a7760142 (diff)
Allow comments in /etc/{myname,mygate,defaultdomain}; OK deraadt@
Diffstat (limited to 'etc')
-rw-r--r--etc/netstart8
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/netstart b/etc/netstart
index fe21eae46fa..9733a44e21d 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: netstart,v 1.99 2004/12/04 00:17:05 itojun Exp $
+# $OpenBSD: netstart,v 1.100 2004/12/19 15:37:58 millert Exp $
# Returns true if $1 contains only alphanumerics
isalphanumeric() {
@@ -184,14 +184,14 @@ fi
# /etc/myname contains my symbolic name
if [ -f /etc/myname ]; then
- hostname=`cat /etc/myname`
+ hostname=`stripcom /etc/myname`
hostname $hostname
else
hostname=`hostname`
fi
if [ -f /etc/defaultdomain ]; then
- domainname `cat /etc/defaultdomain`
+ domainname `stripcom /etc/defaultdomain`
fi
# Set the address for the loopback interface. Bringing the
@@ -284,7 +284,7 @@ fi
# that name must be in /etc/hosts.
if [ -f /etc/mygate ]; then
route -qn delete default > /dev/null 2>&1
- route -qn add -host default `cat /etc/mygate`
+ route -qn add -host default `stripcom /etc/mygate`
fi
# Multicast routing.