Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/init/halt.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/init/halt.c (modified) (6 diffs)

branches/3.2/mindi-busybox/init/halt.c

@@ -8 +8 @@
  */
 
-//applet:IF_HALT(APPLET(halt, _BB_DIR_SBIN, _BB_SUID_DROP))
-//applet:IF_HALT(APPLET_ODDNAME(poweroff, halt, _BB_DIR_SBIN, _BB_SUID_DROP, poweroff))
-//applet:IF_HALT(APPLET_ODDNAME(reboot, halt, _BB_DIR_SBIN, _BB_SUID_DROP, reboot))
+//applet:IF_HALT(APPLET(halt, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_HALT(APPLET_ODDNAME(poweroff, halt, BB_DIR_SBIN, BB_SUID_DROP, poweroff))
+//applet:IF_HALT(APPLET_ODDNAME(reboot, halt, BB_DIR_SBIN, BB_SUID_DROP, reboot))
 
 //kbuild:lib-$(CONFIG_HALT) += halt.o
@@ -44 +44 @@
 //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"
@@ -56 +55 @@
 //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"
@@ -65 +63 @@
 //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"
@@ -75 +72 @@
 #if ENABLE_FEATURE_WTMP
 #include <sys/utsname.h>
-#include <utmp.h>
 
 static void write_wtmp(void)
@@ -159 +155 @@
                  * 0 == shutdown
                  * 6 == reboot */
-                rc = execlp(CONFIG_TELINIT_PATH,
+                execlp(CONFIG_TELINIT_PATH,
                         CONFIG_TELINIT_PATH,
                         which == 2 ? "6" : "0",
                         (char *)NULL
                 );
+                bb_perror_msg_and_die("can't execute '%s'",
+                        CONFIG_TELINIT_PATH);
             }
         }