summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenis Vlasenko2009-04-21 20:40:51 +0000
committerDenis Vlasenko2009-04-21 20:40:51 +0000
commitf9d4fc3cf8ca91dbebfa305c5c08f8781caa1a0f (patch)
treeb341f97661b629cc112ebe09933c044ebb31a6f7 /include
parent950bd729665cecf1fbee65bc6e57e087c93aaab6 (diff)
downloadbusybox-f9d4fc3cf8ca91dbebfa305c5c08f8781caa1a0f.zip
busybox-f9d4fc3cf8ca91dbebfa305c5c08f8781caa1a0f.tar.gz
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.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/usage.h b/include/usage.h
index bfb07a4..84da445 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -4125,12 +4125,13 @@
) \
#define switch_root_trivial_usage \
- "[-c /dev/console] NEW_ROOT NEW_INIT [ARGUMENTS_TO_INIT]"
+ "[-c /dev/console] NEW_ROOT NEW_INIT [ARG...]"
#define switch_root_full_usage "\n\n" \
- "Use from PID 1 under initramfs to free initramfs, chroot to NEW_ROOT,\n" \
- "and exec NEW_INIT\n" \
+ "Free initramfs and switch to another root fs:\n" \
+ "chroot to NEW_ROOT, delete all in /, move NEW_ROOT to /,\n" \
+ "execute NEW_INIT. PID must be 1. NEW_ROOT must be a mountpoint.\n" \
"\nOptions:" \
- "\n -c Redirect console to device on new root" \
+ "\n -c DEV Reopen stdio to DEV after switch" \
#define sync_trivial_usage \
""
@@ -4142,7 +4143,7 @@
#define sysctl_full_usage "\n\n" \
"Configure kernel parameters at runtime\n" \
"\nOptions:" \
- "\n -n Disable printing of key names" \
+ "\n -n Don't print key names" \
"\n -e Don't warn about unknown keys" \
"\n -w Change sysctl setting" \
"\n -p FILE Load sysctl settings from FILE (default /etc/sysctl.conf)" \