diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-09-01 18:07:36 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-09-01 18:07:36 +0000 |
commit | 36c22561d92e7fa3603b24f0b1e4aa780f1054b0 (patch) | |
tree | 461f3ec0018058f6cd79a30a0a82a2467b059c38 | |
parent | 00d3ba549695493449314b2b2f73429563c51d81 (diff) |
support # characters in bridgename.* files; millert
-rw-r--r-- | etc/netstart | 5 | ||||
-rw-r--r-- | share/man/man5/hostname.if.5 | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/etc/netstart b/etc/netstart index e0782940141..f945b1f3161 100644 --- a/etc/netstart +++ b/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: netstart,v 1.50 1999/09/01 05:07:50 deraadt Exp $ +# $OpenBSD: netstart,v 1.51 1999/09/01 18:07:34 deraadt Exp $ # Returns true if $1 contains only alphanumerics isalphanumeric() { @@ -114,7 +114,8 @@ for bn in /etc/bridgename.*; do { # All lines are run as brconfig(8) commands. while read line ; do - # XXX should support # comments and skip blank lines + line=${line%%#*} # strip comments + test -z "$line" && continue brconfig $if $line done } < /etc/bridgename.$if diff --git a/share/man/man5/hostname.if.5 b/share/man/man5/hostname.if.5 index 5d95a988156..52f0e7981f0 100644 --- a/share/man/man5/hostname.if.5 +++ b/share/man/man5/hostname.if.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: hostname.if.5,v 1.2 1999/09/01 05:16:50 deraadt Exp $ +.\" $OpenBSD: hostname.if.5,v 1.3 1999/09/01 18:07:35 deraadt Exp $ .\" $NetBSD: hosts.5,v 1.4 1994/11/30 19:31:20 jtc Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 @@ -171,6 +171,7 @@ The options are as follows: .Bl -tag -width indent -offset xxxx .It Va brconfig-arguments .Xr brconfig 8 -is called for each successive line. +is called for each successive line. Comments starting with # are +permitted. .El .Pp |