diff options
| author |   jason <jason@openbsd.org> | 2001-01-10 22:17:10 +0000 |
|---|---|---|
| committer | jason <jason@openbsd.org> | 2001-01-10 22:17:10 +0000 |
| commit | e9830db65a906a7a053f55262ff617812d90acbd (patch) | |
| tree | cbf428a0f81e2f48bfb36b52be2f2e40f5ff320b | |
| parent | Fix comment. (diff) | |
| download | wireguard-openbsd-e9830db65a906a7a053f55262ff617812d90acbd.tar.xz wireguard-openbsd-e9830db65a906a7a053f55262ff617812d90acbd.zip | |
support !command in bridgename.if files, too
| -rw-r--r-- | etc/netstart | 12 | ||||
| -rw-r--r-- | share/man/man5/hostname.if.5 | 7 |
2 files changed, 16 insertions, 3 deletions
diff --git a/etc/netstart b/etc/netstart index 27642dcba0a..bc7e4a77d2c 100644 --- a/etc/netstart +++ b/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: netstart,v 1.74 2000/11/27 17:14:00 millert Exp $ +# $OpenBSD: netstart,v 1.75 2001/01/10 22:17:10 jason Exp $ # Returns true if $1 contains only alphanumerics isalphanumeric() { @@ -231,7 +231,15 @@ for bn in /etc/bridgename.*; do while read line ; do line=${line%%#*} # strip comments test -z "$line" && continue - brconfig $if $line + case "$line" in + "!"*) + cmd="${line#*!}" + ;; + *) + cmd="brconfig $if $line" + ;; + esac + eval "$cmd" done } < /etc/bridgename.$if done diff --git a/share/man/man5/hostname.if.5 b/share/man/man5/hostname.if.5 index 0e6229974f1..5fac147325f 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.23 2000/11/20 08:00:03 deraadt Exp $ +.\" $OpenBSD: hostname.if.5,v 1.24 2001/01/10 22:17:10 jason Exp $ .\" $NetBSD: hosts.5,v 1.4 1994/11/30 19:31:20 jtc Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 @@ -247,6 +247,8 @@ add fxp0 add ep1 -learn fxp0 # +!ipsecadm flush +# static fxp0 8:0:20:1e:2f:2b up # and finally enable it .Ed @@ -258,6 +260,9 @@ The options are as follows: is called for each successive line. Comments starting with .Ql # +and commands to be executed +prefixed by +.Ql ! are permitted. .El .Sh SEE ALSO |