svn commit: r331015 - head/etc/rc.d

[Rodney W. Grimes]

[ Charset UTF-8 unsupported, converting... ]
> Author: dab
> Date: Thu Mar 15 18:29:56 2018
> New Revision: 331015
> URL: https://svnweb.freebsd.org/changeset/base/331015
> 
> Log:
>   Modify rc.d/fsck to handle new status from fsck/fsck_ffs
>   
>   r328013 introduced a new error code from fsck_ffs that indicates that
>   it could not completely fix the file system; this happens when it
>   prints the message PLEASE RERUN FSCK. However, this status can happen
>   when fsck is run in "preen" mode and the rc.d/fsck script does not
>   handle that error code. Modify rc.d/fsck so that if "fsck -p"
>   ("preen") returns the new status code (16) it will run "fsck -y", as
>   it currently does for a status code of 8 (the "standard error exit").

It will run "fsck -y" IFF fsck_y_enable is set to yes, otherwise it
drops to single user as it does for error 8.

>   Reported by:	markj
>   Reviewed by:	mckusick, markj, ian, rgrimes
>   MFC after:	3 days
>   Sponsored by:	Dell EMC
>   Differential Revision:	https://reviews.freebsd.org/D14679
> 
> Modified:
>   head/etc/rc.d/fsck
> 
> Modified: head/etc/rc.d/fsck
> ==============================================================================
> --- head/etc/rc.d/fsck	Thu Mar 15 18:12:55 2018	(r331014)
> +++ head/etc/rc.d/fsck	Thu Mar 15 18:29:56 2018	(r331015)
> @@ -57,7 +57,7 @@ fsck_start()
>  			echo "Reboot failed; help!"
>  			stop_boot
>  			;;
> -		8)
> +		8|16)
>  			if checkyesno fsck_y_enable; then
>  				echo "File system preen failed, trying fsck -y ${fsck_y_flags}"
>  				fsck -y ${fsck_y_flags}
> 
> 

-- 
Rod Grimes                                                 rgrimes at freebsd.org