Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge

Conflicts:
	procps/ps.c

2 files changed, 3 insertions, 5 deletions

diff --git a/init/bootchartd.c b/init/bootchartd.c
index 009e2690c..5f6121fa4 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -327,7 +327,6 @@ static void finalize(char *tempdir, const char *prog)
 //usage:       "start [PROG ARGS]|stop|init"
 //usage:#define bootchartd_full_usage "\n\n"
 //usage:       "Create /var/log/bootchart.tgz with boot chart data\n"
-//usage:     "\nOptions:"
 //usage:     "\nstart: start background logging; with PROG, run PROG, then kill logging with USR1"
 //usage:     "\nstop: send USR1 to all bootchartd processes"
 //usage:     "\ninit: start background logging; stop when getty/xdm is seen (for init scripts)"
diff --git a/init/halt.c b/init/halt.c
index a84a72747..1aac0faf9 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -43,7 +43,6 @@
 //usage:       "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]")
 //usage:#define halt_full_usage "\n\n"
 //usage:       "Halt the system\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -d SEC  Delay interval"
 //usage:     "\n        -n      Do not sync"
 //usage:     "\n        -f      Force (don't go through init)"
@@ -55,7 +54,6 @@
 //usage:       "[-d DELAY] [-n] [-f]"
 //usage:#define poweroff_full_usage "\n\n"
 //usage:       "Halt and shut off power\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -d SEC  Delay interval"
 //usage:     "\n        -n      Do not sync"
 //usage:     "\n        -f      Force (don't go through init)"
@@ -64,7 +62,6 @@
 //usage:       "[-d DELAY] [-n] [-f]"
 //usage:#define reboot_full_usage "\n\n"
 //usage:       "Reboot the system\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -d SEC  Delay interval"
 //usage:     "\n        -n      Do not sync"
 //usage:     "\n        -f      Force (don't go through init)"
@@ -157,11 +154,13 @@ int halt_main(int argc UNUSED_PARAM, char **argv)
                                 /* runlevels:
                                  * 0 == shutdown
                                  * 6 == reboot */
-                                rc = execlp(CONFIG_TELINIT_PATH,
+                                execlp(CONFIG_TELINIT_PATH,
                                                 CONFIG_TELINIT_PATH,
                                                 which == 2 ? "6" : "0",
                                                 (char *)NULL
                                 );
+                                perror_msg_and_die("can't execute '%s'",
+                                                CONFIG_TELINIT_PATH);
                         }
                 }
         } else {