===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.428
retrieving revision 1.429
diff -c -r1.428 -r1.429
*** src/etc/rc	2014/07/12 10:14:03	1.428
--- src/etc/rc	2014/07/13 12:12:30	1.429
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.428 2014/07/12 10:14:03 robert Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
--- 1,4 ----
! #	$OpenBSD: rc,v 1.429 2014/07/13 12:12:30 claudio Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
***************
*** 205,210 ****
--- 205,246 ----
  	fi
  }
  
+ do_fsck()
+ {
+ 	local _flags=$1
+ 
+ 	fsck -p $_flags
+ 	case $? in
+ 	0)
+ 		;;
+ 	2)
+ 		exit 1
+ 		;;
+ 	4)
+ 		echo "Rebooting..."
+ 		reboot
+ 		echo "Reboot failed; help!"
+ 		exit 1
+ 		;;
+ 	8)
+ 		echo "Automatic file system check failed; help!"
+ 		exit 1
+ 		;;
+ 	12)
+ 		echo "Boot interrupted."
+ 		exit 1
+ 		;;
+ 	130)
+ 		# interrupt before catcher installed
+ 		exit 1
+ 		;;
+ 	*)
+ 		echo "Unknown error; help!"
+ 		exit 1
+ 		;;
+ 	esac
+ }
+ 
  # End subroutines
  
  stty status '^T'
***************
*** 272,307 ****
  	echo "Fast boot: skipping disk checks."
  elif [ X"$1" = X"autoboot" ]; then
  	echo "Automatic boot in progress: starting file system checks."
! 	fsck -p
! 	case $? in
! 	0)
! 		;;
! 	2)
! 		exit 1
! 		;;
! 	4)
! 		echo "Rebooting..."
! 		reboot
! 		echo "Reboot failed; help!"
! 		exit 1
! 		;;
! 	8)
! 		echo "Automatic file system check failed; help!"
! 		exit 1
! 		;;
! 	12)
! 		echo "Boot interrupted."
! 		exit 1
! 		;;
! 	130)
! 		# interrupt before catcher installed
! 		exit 1
! 		;;
! 	*)
! 		echo "Unknown error; help!"
! 		exit 1
! 		;;
! 	esac
  fi
  
  trap "echo 'Boot interrupted.'; exit 1" 3
--- 308,314 ----
  	echo "Fast boot: skipping disk checks."
  elif [ X"$1" = X"autoboot" ]; then
  	echo "Automatic boot in progress: starting file system checks."
! 	do_fsck
  fi
  
  trap "echo 'Boot interrupted.'; exit 1" 3
***************
*** 394,400 ****
  
  echo -n 'starting early daemons:'
  start_daemon syslogd ldattach pflogd named nsd unbound ntpd
! start_daemon isakmpd iked sasyncd ldapd npppd
  echo '.'
  
  if [ X"${ipsec}" != X"NO" ]; then
--- 401,407 ----
  
  echo -n 'starting early daemons:'
  start_daemon syslogd ldattach pflogd named nsd unbound ntpd
! start_daemon iscsid isakmpd iked sasyncd ldapd npppd
  echo '.'
  
  if [ X"${ipsec}" != X"NO" ]; then
***************
*** 413,418 ****
--- 420,429 ----
  
  mount -a
  swapctl -A -t noblk
+ 
+ # check and mount networked filesystems
+ do_fsck -N
+ mount -a -N
  
  # /var/crash should be a directory or a symbolic link
  # to the crash directory if core dumps are to be saved.