D43829.1793849493.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D43829.1793849493.diff
View Options

	diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
	--- a/sbin/reboot/reboot.8
	+++ b/sbin/reboot/reboot.8
	@@ -39,18 +39,22 @@
	.Op Fl DflNnpq
	.Op Fl e Ar variable=value
	.Op Fl k Ar kernel
	+.Op Fl o Ar options
	.Nm
	.Op Fl cDdflNnpqr
	.Op Fl e Ar variable=value
	.Op Fl k Ar kernel
	+.Op Fl o Ar options
	.Nm fasthalt
	.Op Fl DflNnpq
	.Op Fl e Ar variable=value
	.Op Fl k Ar kernel
	+.Op Fl o Ar options
	.Nm fastboot
	.Op Fl dDflNnpq
	.Op Fl e Ar variable=value
	.Op Fl k Ar kernel
	+.Op Fl o Ar options
	.Sh DESCRIPTION
	The
	.Nm halt
	@@ -146,6 +150,9 @@
	.It Fl n
	The file system cache is not flushed.
	This option should probably not be used.
	+.It Fl o Ar options
	+This option
	+allows the passing of kernel flags for the next boot.
	.It Fl p
	The system will turn off the power if it can.
	If the power down action fails, the system
	diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
	--- a/sbin/reboot/reboot.c
	+++ b/sbin/reboot/reboot.c
	@@ -180,7 +180,7 @@
	} else
	howto = 0;
	Dflag = fflag = lflag = Nflag = nflag = qflag = false;
	- while ((ch = getopt(argc, argv, "cDde:k:lNnpqr")) != -1)
	+ while ((ch = getopt(argc, argv, "cDde:k:lNno:pqr")) != -1)
	switch(ch) {
	case 'c':
	howto \|= RB_POWERCYCLE;
	@@ -212,6 +212,9 @@
	nflag = true;
	Nflag = true;
	break;
	+ case 'o':
	+ add_env(&env, "kernel_options", optarg);
	+ break;
	case 'p':
	howto \|= RB_POWEROFF;
	break;