Page MenuHomeFreeBSD
Files F144481064

D54122.1774892890.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D54122.1774892890.diff
View Options

diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -105,9 +105,9 @@
options is specified,
.Nm
will execute
-.Xr halt 8
+.Xr fasthalt 8
or
-.Xr reboot 8
+.Xr fastboot 8
instead of sending a signal to
.Xr init 8 .
.It Fl n
@@ -116,9 +116,9 @@
option is specified, prevent the file system cache from being flushed by passing
.Fl n
to
-.Xr halt 8
+.Xr fasthalt 8
or
-.Xr reboot 8 .
+.Xr fastboot 8 .
This option should probably not be used.
.It Fl q
Shut down quietly.
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -407,7 +407,7 @@
} else {
if (doreboot) {
BOOTTRACE("exec reboot(8) -l...");
- execle(_PATH_REBOOT, "reboot", "-l", nosync,
+ execle(_PATH_REBOOT, "fastboot", "-l", nosync,
(char *)NULL, empty_environ);
syslog(LOG_ERR, "shutdown: can't exec %s: %m.",
_PATH_REBOOT);
@@ -415,7 +415,7 @@
}
else if (dohalt) {
BOOTTRACE("exec halt(8) -l...");
- execle(_PATH_HALT, "halt", "-l", nosync,
+ execle(_PATH_HALT, "fasthalt", "-l", nosync,
(char *)NULL, empty_environ);
syslog(LOG_ERR, "shutdown: can't exec %s: %m.",
_PATH_HALT);
@@ -423,14 +423,14 @@
}
else if (dopower) {
BOOTTRACE("exec halt(8) -l -p...");
- execle(_PATH_HALT, "halt", "-l", "-p", nosync,
+ execle(_PATH_HALT, "fasthalt", "-l", "-p", nosync,
(char *)NULL, empty_environ);
syslog(LOG_ERR, "shutdown: can't exec %s: %m.",
_PATH_HALT);
warn(_PATH_HALT);
}
else if (docycle) {
- execle(_PATH_HALT, "halt", "-l", "-c", nosync,
+ execle(_PATH_HALT, "fasthalt", "-l", "-c", nosync,
(char *)NULL, empty_environ);
syslog(LOG_ERR, "shutdown: can't exec %s: %m.",
_PATH_HALT);

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 30, 5:48 PM (9 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28231324
Default Alt Text
D54122.1774892890.diff (1 KB)

Event Timeline