From 127d91856d3d0f0ebcff110072b670a85cf3da85 Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 11 Mar 2008 17:21:14 +0000
Subject: [PATCH] Do nextboot -D twice during boot.  The first time in
 rc.d/root which ensures that we can remove the file as early as possible, but
 shut up nextboot at this moment if the operation is failed, because /boot is
 not necessarily a part of /; the newly added second run is placed in
 rc.d/mountlate after all filesystems were mounted.

Discussed at:		-rc@
Suggestions from:	brooks, mtm
MFC after:		1 month
---
 etc/rc.d/root | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/rc.d/root b/etc/rc.d/root
index f2131d836d66..6bddb17f2225 100755
--- a/etc/rc.d/root
+++ b/etc/rc.d/root
@@ -34,7 +34,7 @@ root_start()
 	# If we booted a special kernel remove the record
 	# so we will boot the default kernel next time.
 	if [ -x /sbin/nextboot ]; then
-		/sbin/nextboot -D
+		/sbin/nextboot -D > /dev/null 2>&1
 	fi
 }