===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.130
retrieving revision 1.131
diff -c -r1.130 -r1.131
*** src/etc/rc	2000/02/28 17:28:35	1.130
--- src/etc/rc	2000/03/05 16:55:22	1.131
***************
*** 1,10 ****
! #	$OpenBSD: rc,v 1.130 2000/02/28 17:28:35 itojun Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
  # Output and error are redirected to console by init,
  # and the console is the controlling terminal.
  
  stty status '^T'
  
  # Set shell to ignore SIGINT (2), but not children;
--- 1,29 ----
! #	$OpenBSD: rc,v 1.131 2000/03/05 16:55:22 millert Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
  # Output and error are redirected to console by init,
  # and the console is the controlling terminal.
  
+ # Subroutines (have to come first).
+ 
+ # Strip comments (and leading/trailing whitespace if IFS is set)
+ # from a file and spew to stdout
+ stripcom() {
+ 	local _file="$1"
+ 	local _line
+ 
+ 	{
+ 		while read _line ; do
+ 			_line=${_line%%#*}		# strip comments
+ 			test -z "$_line" && continue
+ 			echo $_line
+ 		done
+ 	} < $_file
+ }
+ 
+ # End subroutines
+ 
  stty status '^T'
  
  # Set shell to ignore SIGINT (2), but not children;
***************
*** 108,121 ****
  if [ -f /etc/sysctl.conf ]; then
  (
  	# delete comments and blank lines
! 	# we use ed here because /usr may not be mounted yet.
! 	set -- `
! 	ed -s /etc/sysctl.conf <<EOF
! 1,\\\$s/#.*$//
! g/^..*/p
! Q
! EOF
! `
  	while [ $# -ge 1 ] ; do
  		sysctl -w $1
  		shift
--- 127,133 ----
  if [ -f /etc/sysctl.conf ]; then
  (
  	# delete comments and blank lines
! 	set -- `stripcom /etc/sysctl.conf`
  	while [ $# -ge 1 ] ; do
  		sysctl -w $1
  		shift
***************
*** 154,160 ****
  if [ -f /etc/ifaliases ]; then
  (
  	# delete comments and blank lines
! 	set -- `sed -e 's/#.*$//' -e '/^$/d' /etc/ifaliases`
  	while [ $# -ge 3 ] ; do
  		ifconfig $1 inet alias $2 netmask $3
  		route -n add -host $2 localhost
--- 166,172 ----
  if [ -f /etc/ifaliases ]; then
  (
  	# delete comments and blank lines
! 	set -- `stripcom /etc/ifaliases`
  	while [ $# -ge 3 ] ; do
  		ifconfig $1 inet alias $2 netmask $3
  		route -n add -host $2 localhost
***************
*** 326,332 ****
  if [ ! -f /etc/motd ]; then
  	install -c -o root -g wheel -m 664 /dev/null /etc/motd
  fi
! T=`mktemp /tmp/_motd.XXXXXXXXXX` 
  if [ $? -eq 0 ]; then
  	sysctl -n kern.version | sed 1q > $T
  	echo "" >> $T
--- 338,344 ----
  if [ ! -f /etc/motd ]; then
  	install -c -o root -g wheel -m 664 /dev/null /etc/motd
  fi
! T=`mktemp /tmp/_motd.XXXXXXXXXX`
  if [ $? -eq 0 ]; then
  	sysctl -n kern.version | sed 1q > $T
  	echo "" >> $T