diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 20:40:51 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 20:40:51 +0000 |
commit | f9d4fc3cf8ca91dbebfa305c5c08f8781caa1a0f (patch) | |
tree | b341f97661b629cc112ebe09933c044ebb31a6f7 /include | |
parent | 950bd729665cecf1fbee65bc6e57e087c93aaab6 (diff) | |
download | busybox-w32-f9d4fc3cf8ca91dbebfa305c5c08f8781caa1a0f.tar.gz busybox-w32-f9d4fc3cf8ca91dbebfa305c5c08f8781caa1a0f.tar.bz2 busybox-w32-f9d4fc3cf8ca91dbebfa305c5c08f8781caa1a0f.zip |
switch_root: improve behavior on error; improve help text
*: make "can't execute '%s'" message uniform
Diffstat (limited to 'include')
-rw-r--r-- | include/usage.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/usage.h b/include/usage.h index bfb07a4cf..84da445f2 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -4125,12 +4125,13 @@ | |||
4125 | ) \ | 4125 | ) \ |
4126 | 4126 | ||
4127 | #define switch_root_trivial_usage \ | 4127 | #define switch_root_trivial_usage \ |
4128 | "[-c /dev/console] NEW_ROOT NEW_INIT [ARGUMENTS_TO_INIT]" | 4128 | "[-c /dev/console] NEW_ROOT NEW_INIT [ARG...]" |
4129 | #define switch_root_full_usage "\n\n" \ | 4129 | #define switch_root_full_usage "\n\n" \ |
4130 | "Use from PID 1 under initramfs to free initramfs, chroot to NEW_ROOT,\n" \ | 4130 | "Free initramfs and switch to another root fs:\n" \ |
4131 | "and exec NEW_INIT\n" \ | 4131 | "chroot to NEW_ROOT, delete all in /, move NEW_ROOT to /,\n" \ |
4132 | "execute NEW_INIT. PID must be 1. NEW_ROOT must be a mountpoint.\n" \ | ||
4132 | "\nOptions:" \ | 4133 | "\nOptions:" \ |
4133 | "\n -c Redirect console to device on new root" \ | 4134 | "\n -c DEV Reopen stdio to DEV after switch" \ |
4134 | 4135 | ||
4135 | #define sync_trivial_usage \ | 4136 | #define sync_trivial_usage \ |
4136 | "" | 4137 | "" |
@@ -4142,7 +4143,7 @@ | |||
4142 | #define sysctl_full_usage "\n\n" \ | 4143 | #define sysctl_full_usage "\n\n" \ |
4143 | "Configure kernel parameters at runtime\n" \ | 4144 | "Configure kernel parameters at runtime\n" \ |
4144 | "\nOptions:" \ | 4145 | "\nOptions:" \ |
4145 | "\n -n Disable printing of key names" \ | 4146 | "\n -n Don't print key names" \ |
4146 | "\n -e Don't warn about unknown keys" \ | 4147 | "\n -e Don't warn about unknown keys" \ |
4147 | "\n -w Change sysctl setting" \ | 4148 | "\n -w Change sysctl setting" \ |
4148 | "\n -p FILE Load sysctl settings from FILE (default /etc/sysctl.conf)" \ | 4149 | "\n -p FILE Load sysctl settings from FILE (default /etc/sysctl.conf)" \ |