Module Name: src
Committed By: apb
Date: Sun Sep 26 18:52:05 UTC 2010
Modified Files:
src/etc/rc.d: network
src/share/man/man5: ifconfig.if.5
Log Message:
Collapse <abckslash><newline> sequences in /etc/ifconfig.xxx files read
by /etc/rc.d/network. Fixes PR 41662 by Christoph Badura, which was
also reported independently by Jeremy C. Reed.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/etc/rc.d/network
cvs rdiff -u -r1.13 -r1.14 src/share/man/man5/ifconfig.if.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/network
diff -u src/etc/rc.d/network:1.60 src/etc/rc.d/network:1.61
--- src/etc/rc.d/network:1.60 Fri Sep 11 21:25:07 2009
+++ src/etc/rc.d/network Sun Sep 26 18:52:04 2010
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: network,v 1.60 2009/09/11 21:25:07 cegger Exp $
+# $NetBSD: network,v 1.61 2010/09/26 18:52:04 apb Exp $
#
# PROVIDE: network
@@ -259,6 +259,7 @@
)
;;
esac |
+ collapse_backslash_newline |
while read -r args; do
case "$args" in
''|"#"*|create)
Index: src/share/man/man5/ifconfig.if.5
diff -u src/share/man/man5/ifconfig.if.5:1.13 src/share/man/man5/ifconfig.if.5:1.14
--- src/share/man/man5/ifconfig.if.5:1.13 Fri Jan 9 09:39:05 2009
+++ src/share/man/man5/ifconfig.if.5 Sun Sep 26 18:52:04 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: ifconfig.if.5,v 1.13 2009/01/09 09:39:05 apb Exp $
+.\" $NetBSD: ifconfig.if.5,v 1.14 2010/09/26 18:52:04 apb Exp $
.\"
.\" Copyright (c) 1996 Matthew R. Green
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd January 9, 2009
+.Dd September 26, 2010
.Dt IFCONFIG.IF 5
.Os
.Sh NAME
@@ -63,6 +63,9 @@
In the case of a variable, semicolons may be used instead of
newlines, as described in
.Xr rc.conf 5 .
+.Ao backslash Ac Ns Ao newline Ac
+sequences in files are ignored, so long logical lines may be
+made up of several shorter physical lines.
.Pp
Normally, a line will be evaluated as command line arguments to
.Xr ifconfig 8 .
