===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.540
retrieving revision 1.541
diff -c -r1.540 -r1.541
*** src/etc/rc	2019/11/06 16:26:24	1.540
--- src/etc/rc	2019/11/10 15:02:36	1.541
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.540 2019/11/06 16:26:24 deraadt 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
--- 1,4 ----
! #	$OpenBSD: rc,v 1.541 2019/11/10 15:02:36 naddy 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
***************
*** 220,226 ****
  			$_install /usr/libexec/ld.so /usr/libexec/ld.so.save
  			$_install ld.so.test $_lib_dir/ld.so
  		else
! 			cc -shared -o $_lib $(ls *.so | sort -R) $(cat .ldadd)
  			[[ -s $_lib ]] && file $_lib | fgrep -q 'shared object'
  			LD_BIND_NOW=1 LD_LIBRARY_PATH=$_tmpdir awk 'BEGIN {exit 0}'
  			LD_BIND_NOW=1 LD_LIBRARY_PATH=$_tmpdir openssl \
--- 220,226 ----
  			$_install /usr/libexec/ld.so /usr/libexec/ld.so.save
  			$_install ld.so.test $_lib_dir/ld.so
  		else
! 			cc -shared -o $_lib $(ls *.so | sort -R) $(<.ldadd)
  			[[ -s $_lib ]] && file $_lib | fgrep -q 'shared object'
  			LD_BIND_NOW=1 LD_LIBRARY_PATH=$_tmpdir awk 'BEGIN {exit 0}'
  			LD_BIND_NOW=1 LD_LIBRARY_PATH=$_tmpdir openssl \
***************
*** 389,395 ****
  
  # Set keyboard encoding.
  if [[ -x /sbin/kbd && -s /etc/kbdtype ]]; then
! 	kbd "$(cat /etc/kbdtype)"
  fi
  
  wsconsctl_conf
--- 389,395 ----
  
  # Set keyboard encoding.
  if [[ -x /sbin/kbd && -s /etc/kbdtype ]]; then
! 	kbd "$(</etc/kbdtype)"
  fi
  
  wsconsctl_conf