aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorPawel Jakub Dawidek <pjd@FreeBSD.org>2010-12-30 18:06:31 +0000
committerPawel Jakub Dawidek <pjd@FreeBSD.org>2010-12-30 18:06:31 +0000
commit6868734cbe9f08a48af5f89ab9c1bbce1f72ce1c (patch)
tree841e4912bb3223fec4f317ed614a2a385cbb5dec /sbin
parent4a9ef3f833f49f7ade32cdc8050d5b06a01bef76 (diff)
downloadsrc-6868734cbe9f08a48af5f89ab9c1bbce1f72ce1c.tar.gz
src-6868734cbe9f08a48af5f89ab9c1bbce1f72ce1c.zip
For compatibility with Linux and Solaris add poweroff(8).
It is implemented as a hard link to shutdown(8) and it is equivalent of: # shutdown -p now While I'm here put one line of usage into one line of C code so it is easier to grep(1) and separate unrelated code with empty line. MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=216823
Diffstat (limited to 'sbin')
-rw-r--r--sbin/shutdown/Makefile2
-rw-r--r--sbin/shutdown/shutdown.813
-rw-r--r--sbin/shutdown/shutdown.c28
3 files changed, 39 insertions, 4 deletions
diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile
index 09b0b3ebf01d..a6ecb93519f0 100644
--- a/sbin/shutdown/Makefile
+++ b/sbin/shutdown/Makefile
@@ -3,6 +3,8 @@
PROG= shutdown
MAN= shutdown.8
+LINKS= ${BINDIR}/shutdown ${BINDIR}/poweroff
+MLINKS= shutdown.8 poweroff.8
BINOWN= root
BINGRP= operator
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index 1f7a1b06ecdd..032c4f3ca2d2 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -28,11 +28,12 @@
.\" @(#)shutdown.8 8.2 (Berkeley) 4/27/95
.\" $FreeBSD$
.\"
-.Dd December 23, 2008
+.Dd December 30, 2010
.Dt SHUTDOWN 8
.Os
.Sh NAME
-.Nm shutdown
+.Nm shutdown ,
+.Nm poweroff
.Nd "close down the system at a given time"
.Sh SYNOPSIS
.Nm
@@ -47,6 +48,7 @@
.Oc
.Ar time
.Op Ar warning-message ...
+.Nm poweroff
.Sh DESCRIPTION
The
.Nm
@@ -173,6 +175,13 @@ When run without options, the
utility will place the system into single user mode at the
.Ar time
specified.
+.Pp
+Calling utility as
+.Nm poweroff
+is equivalent of calling:
+.Bd -literal -offset indent
+shutdown -p now
+.Ed
.Sh FILES
.Bl -tag -width /var/run/nologin -compact
.It Pa /var/run/nologin
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 9032866f9451..8e722ca082b6 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -115,8 +115,31 @@ main(int argc, char **argv)
if (geteuid())
errx(1, "NOT super-user");
#endif
+
nosync = NULL;
readstdin = 0;
+
+ /*
+ * Test for the special case where the utility is called as
+ * "poweroff", for which it runs 'shutdown -p now'.
+ */
+ if ((p = rindex(argv[0], '/')) == NULL)
+ p = argv[0];
+ else
+ ++p;
+ if (strcmp(p, "poweroff") == 0) {
+ if (getopt(argc, argv, "") != -1)
+ usage((char *)NULL);
+ argc -= optind;
+ argv += optind;
+ if (argc != 0)
+ usage((char *)NULL);
+ dopower = 1;
+ offset = 0;
+ (void)time(&shuttime);
+ goto poweroff;
+ }
+
while ((ch = getopt(argc, argv, "-hknopr")) != -1)
switch (ch) {
case '-':
@@ -161,6 +184,7 @@ main(int argc, char **argv)
getoffset(*argv++);
+poweroff:
if (*argv) {
for (p = mbuf, len = sizeof(mbuf); *argv; ++argv) {
arglen = strlen(*argv);
@@ -510,7 +534,7 @@ usage(const char *cp)
if (cp != NULL)
warnx("%s", cp);
(void)fprintf(stderr,
- "usage: shutdown [-] [-h | -p | -r | -k] [-o [-n]]"
- " time [warning-message ...]\n");
+ "usage: shutdown [-] [-h | -p | -r | -k] [-o [-n]] time [warning-message ...]\n"
+ " poweroff\n");
exit(1);
}