D4449.id10993.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D4449.id10993.diff
View Options

	Index: sbin/reboot/reboot.8
	===================================================================
	--- sbin/reboot/reboot.8
	+++ sbin/reboot/reboot.8
	@@ -28,7 +28,7 @@
	.\" @(#)reboot.8 8.1 (Berkeley) 6/9/93
	.\" $FreeBSD$
	.\"
	-.Dd May 22, 2015
	+.Dd Dec 12, 2015
	.Dt REBOOT 8
	.Os
	.Sh NAME
	@@ -39,16 +39,16 @@
	.Nd stopping and restarting the system
	.Sh SYNOPSIS
	.Nm halt
	-.Op Fl lnpq
	+.Op Fl lNnpq
	.Op Fl k Ar kernel
	.Nm
	-.Op Fl dlnpqr
	+.Op Fl dlNnpqr
	.Op Fl k Ar kernel
	.Nm fasthalt
	-.Op Fl lnpq
	+.Op Fl lNnpq
	.Op Fl k Ar kernel
	.Nm fastboot
	-.Op Fl dlnpq
	+.Op Fl dlNnpq
	.Op Fl k Ar kernel
	.Sh DESCRIPTION
	The
	@@ -94,6 +94,16 @@
	or
	.Nm halt
	and log this themselves.
	+.It Fl N
	+The file system cache is not flushed during the initial process clean-up,
	+however the kernel level
	+.Xr reboot 2
	+is still processed with a sync.
	+This option can be useful for performing a
	+.Dq best-effort
	+reboot when devices may be unavailable, such as when devices have been
	+disconnected, e.g.,
	+.Xr iscsi 4 .
	.It Fl n
	The file system cache is not flushed.
	This option should probably not be used.
	Index: sbin/reboot/reboot.c
	===================================================================
	--- sbin/reboot/reboot.c
	+++ sbin/reboot/reboot.c
	@@ -77,7 +77,7 @@
	} else
	howto = 0;
	lflag = nflag = qflag = 0;
	- while ((ch = getopt(argc, argv, "dk:lnpqr")) != -1)
	+ while ((ch = getopt(argc, argv, "dk:lNnpqr")) != -1)
	switch(ch) {
	case 'd':
	howto \|= RB_DUMP;
	@@ -92,6 +92,9 @@
	nflag = 1;
	howto \|= RB_NOSYNC;
	break;
	+ case 'N':
	+ nflag = 1;
	+ break;
	case 'p':
	howto \|= RB_POWEROFF;
	break;