diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/applets.h | 8 | ||||
-rw-r--r-- | include/usage.h | 20 |
2 files changed, 17 insertions, 11 deletions
diff --git a/include/applets.h b/include/applets.h index 1fb279ffa..6eb5cfd5f 100644 --- a/include/applets.h +++ b/include/applets.h | |||
@@ -517,8 +517,8 @@ | |||
517 | #ifdef CONFIG_PIVOT_ROOT | 517 | #ifdef CONFIG_PIVOT_ROOT |
518 | APPLET(pivot_root, pivot_root_main, _BB_DIR_SBIN, _BB_SUID_NEVER) | 518 | APPLET(pivot_root, pivot_root_main, _BB_DIR_SBIN, _BB_SUID_NEVER) |
519 | #endif | 519 | #endif |
520 | #ifdef CONFIG_POWEROFF | 520 | #ifdef CONFIG_HALT |
521 | APPLET(poweroff, poweroff_main, _BB_DIR_SBIN, _BB_SUID_NEVER) | 521 | APPLET(poweroff, halt_main, _BB_DIR_SBIN, _BB_SUID_NEVER) |
522 | #endif | 522 | #endif |
523 | #ifdef CONFIG_PRINTENV | 523 | #ifdef CONFIG_PRINTENV |
524 | APPLET(printenv, printenv_main, _BB_DIR_BIN, _BB_SUID_NEVER) | 524 | APPLET(printenv, printenv_main, _BB_DIR_BIN, _BB_SUID_NEVER) |
@@ -544,8 +544,8 @@ | |||
544 | #ifdef CONFIG_REALPATH | 544 | #ifdef CONFIG_REALPATH |
545 | APPLET(realpath, realpath_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) | 545 | APPLET(realpath, realpath_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) |
546 | #endif | 546 | #endif |
547 | #ifdef CONFIG_REBOOT | 547 | #ifdef CONFIG_HALT |
548 | APPLET(reboot, reboot_main, _BB_DIR_SBIN, _BB_SUID_NEVER) | 548 | APPLET(reboot, halt_main, _BB_DIR_SBIN, _BB_SUID_NEVER) |
549 | #endif | 549 | #endif |
550 | #ifdef CONFIG_RENICE | 550 | #ifdef CONFIG_RENICE |
551 | APPLET(renice, renice_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) | 551 | APPLET(renice, renice_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) |
diff --git a/include/usage.h b/include/usage.h index 61fc3af3c..71752c7d5 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -1010,11 +1010,13 @@ | |||
1010 | "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" | 1010 | "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" |
1011 | 1011 | ||
1012 | #define halt_trivial_usage \ | 1012 | #define halt_trivial_usage \ |
1013 | "[-d<delay>]" | 1013 | "[-d<delay>] [-n<nosync>] [-f<force>]" |
1014 | #define halt_full_usage \ | 1014 | #define halt_full_usage \ |
1015 | "Halt the system.\n" \ | 1015 | "Halt the system.\n" \ |
1016 | "Options:\n" \ | 1016 | "Options:\n" \ |
1017 | "\t-d\t\tdelay interval for halting" | 1017 | "\t-d\t\tdelay interval for halting\n" \ |
1018 | "\t-n\t\tno call to sync()\n" \ | ||
1019 | "\t-f\t\tforce halt (don't go through init)\n" | ||
1018 | 1020 | ||
1019 | #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY | 1021 | #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY |
1020 | #define USAGE_HDPARM_IDENT(a) a | 1022 | #define USAGE_HDPARM_IDENT(a) a |
@@ -2372,11 +2374,13 @@ | |||
2372 | "the new root file system." | 2374 | "the new root file system." |
2373 | 2375 | ||
2374 | #define poweroff_trivial_usage \ | 2376 | #define poweroff_trivial_usage \ |
2375 | "[-d<delay>]" | 2377 | "[-d<delay>] [-n<nosync>] [-f<force>]" |
2376 | #define poweroff_full_usage \ | 2378 | #define poweroff_full_usage \ |
2377 | "Halt the system and request that the kernel shut off the power.\n" \ | 2379 | "Halt and shut off power.\n" \ |
2378 | "Options:\n" \ | 2380 | "Options:\n" \ |
2379 | "\t-d\t\tdelay interval for shutting off" | 2381 | "\t-d\t\tdelay interval for halting\n" \ |
2382 | "\t-n\t\tno call to sync()\n" \ | ||
2383 | "\t-f\t\tforce power off (don't go through init)\n" | ||
2380 | 2384 | ||
2381 | #define printenv_trivial_usage \ | 2385 | #define printenv_trivial_usage \ |
2382 | "[VARIABLES...]" | 2386 | "[VARIABLES...]" |
@@ -2475,11 +2479,13 @@ | |||
2475 | "Returns the absolute pathnames of given argument." | 2479 | "Returns the absolute pathnames of given argument." |
2476 | 2480 | ||
2477 | #define reboot_trivial_usage \ | 2481 | #define reboot_trivial_usage \ |
2478 | "[-d<delay>]" | 2482 | "[-d<delay>] [-n<nosync>] [-f<force>]" |
2479 | #define reboot_full_usage \ | 2483 | #define reboot_full_usage \ |
2480 | "Reboot the system.\n" \ | 2484 | "Reboot the system.\n" \ |
2481 | "Options:\n" \ | 2485 | "Options:\n" \ |
2482 | "\t-d\t\tdelay interval for rebooting" | 2486 | "\t-d\t\tdelay interval for rebooting\n" \ |
2487 | "\t-n\t\tno call to sync()\n" \ | ||
2488 | "\t-f\t\tforce reboot (don't go through init)\n" | ||
2483 | 2489 | ||
2484 | #define renice_trivial_usage \ | 2490 | #define renice_trivial_usage \ |
2485 | "{{-n INCREMENT} | PRIORITY} [[ -p | -g | -u ] ID ...]" | 2491 | "{{-n INCREMENT} | PRIORITY} [[ -p | -g | -u ] ID ...]" |