svn commit: r287738 - stable/10/etc/rc.d

[Hiroki Sato]

Author: hrs
Date: Sun Sep 13 04:02:52 2015
New Revision: 287738
URL: https://svnweb.freebsd.org/changeset/base/287738

Log:
  MFC 287614:
  
  - Add uid check.
  - Report delay<0 as a warning.

Modified:
  stable/10/etc/rc.d/bgfsck
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/bgfsck
==============================================================================
--- stable/10/etc/rc.d/bgfsck	Sun Sep 13 03:59:29 2015	(r287737)
+++ stable/10/etc/rc.d/bgfsck	Sun Sep 13 04:02:52 2015	(r287738)
@@ -12,17 +12,24 @@
 name="background-fsck"
 rcvar="background_fsck"
 start_cmd="bgfsck_start"
+start_precmd="bgfsck_start_precmd"
 stop_cmd=":"
 
+bgfsck_start_precmd()
+{
+	if [ $($ID -u) != 0 ]; then
+		err 1 "Must be root."
+	fi
+}
+
 bgfsck_start()
 {
-	if [ -z "${rc_force}" ]; then
-		background_fsck_delay=${background_fsck_delay:-0}
-	else
+	: ${background_fsck_delay=0}
+	if [ -n "${rc_force}" ]; then
 		background_fsck_delay=0
 	fi
 	if [ ${background_fsck_delay} -lt 0 ]; then
-		echo "Background file system checks delayed indefinitely"
+		warn "Background file system checks delayed indefinitely"
 		return 0
 	fi