ee5ab8f32
Denys Vlasenko
2010-09-30
Subject
halt/poweroff/reboot: unify help text
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/usage.src.h+21 -21
| @@ -1521,13 +1521,31 @@ INSERT | |
| #define halt_full_usage "\n\n" \ | |
| "Halt the system\n" \ | |
| "\nOptions:" \ | |
| - | "\n -d Delay interval for halting" \ |
| - | "\n -n No call to sync()" \ |
| - | "\n -f Force halt (don't go through init)" \ |
| + | "\n -d SEC Delay interval" \ |
| + | "\n -n Do not sync" \ |
| + | "\n -f Force (don't go through init)" \ |
| IF_FEATURE_WTMP( \ | |
| "\n -w Only write a wtmp record" \ | |
| ) | |
| + | #define poweroff_trivial_usage \ |
| + | "[-d DELAY] [-n] [-f]" |
| + | #define poweroff_full_usage "\n\n" \ |
| + | "Halt and shut off power\n" \ |
| + | "\nOptions:" \ |
| + | "\n -d SEC Delay interval" \ |
| + | "\n -n Do not sync" \ |
| + | "\n -f Force (don't go through init)" \ |
| + | |
| + | #define reboot_trivial_usage \ |
| + | "[-d DELAY] [-n] [-f]" |
| + | #define reboot_full_usage "\n\n" \ |
| + | "Reboot the system\n" \ |
| + | "\nOptions:" \ |
| + | "\n -d SEC Delay interval" \ |
| + | "\n -n Do not sync" \ |
| + | "\n -f Force (don't go through init)" \ |
| + | |
| #define hdparm_trivial_usage \ | |
| "[OPTIONS] [DEVICE]" | |
| #define hdparm_full_usage "\n\n" \ | |
| @@ -3222,15 +3240,6 @@ INSERT | |
| "$ popmaildir -k ~/Maildir -- nc pop.drvv.ru 110 [<password_file]\n" \ | |
| "$ popmaildir ~/Maildir -- openssl s_client -quiet -connect pop.gmail.com:995 [<password_file]\n" | |
| - | #define poweroff_trivial_usage \ |
| - | "[-d DELAY] [-n] [-f]" |
| - | #define poweroff_full_usage "\n\n" \ |
| - | "Halt and shut off power\n" \ |
| - | "\nOptions:" \ |
| - | "\n -d Delay interval for halting" \ |
| - | "\n -n Do not sync" \ |
| - | "\n -f Force power off (don't go through init)" \ |
| - | |
| #define printenv_trivial_usage \ | |
| "[VARIABLE]..." | |
| #define printenv_full_usage "\n\n" \ | |
| @@ -3373,15 +3382,6 @@ INSERT | |
| #define realpath_full_usage "\n\n" \ | |
| "Return the absolute pathnames of given FILE" | |
| - | #define reboot_trivial_usage \ |
| - | "[-d DELAY] [-n] [-f]" |
| - | #define reboot_full_usage "\n\n" \ |
| - | "Reboot the system\n" \ |
| - | "\nOptions:" \ |
| - | "\n -d Delay interval for rebooting" \ |
| - | "\n -n No call to sync()" \ |
| - | "\n -f Force reboot (don't go through init)" \ |
| - | |
| #define reformime_trivial_usage \ | |
| "[OPTIONS] [FILE]..." | |
| #define reformime_full_usage "\n\n" \ | |