aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-09-01 15:24:52 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-09-01 15:24:52 +0000
commitd93179fd5b6811cf5446a31146099c66c85db359 (patch)
tree853bea712b8efd785e1a41d9894bece1b4973a92 /init
parentd129d7c3cdf1ce81c744dca4cc0c2659bf51cd3f (diff)
downloadbusybox-d93179fd5b6811cf5446a31146099c66c85db359.tar.gz
- halt's -w depends on FEATURE_WTMP (Vladimir Dronnikov)
Diffstat (limited to 'init')
-rw-r--r--init/halt.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/init/halt.c b/init/halt.c
index 8c1f30b08..42b9edc08 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -20,16 +20,16 @@ int halt_main(int argc UNUSED_PARAM, char **argv)
{
static const int magic[] = {
#ifdef RB_HALT_SYSTEM
-RB_HALT_SYSTEM,
+ RB_HALT_SYSTEM,
#elif defined RB_HALT
-RB_HALT,
+ RB_HALT,
#endif
#ifdef RB_POWER_OFF
-RB_POWER_OFF,
+ RB_POWER_OFF,
#elif defined RB_POWERDOWN
-RB_POWERDOWN,
+ RB_POWERDOWN,
#endif
-RB_AUTOBOOT
+ RB_AUTOBOOT
};
static const smallint signals[] = { SIGUSR1, SIGUSR2, SIGTERM };
@@ -46,7 +46,7 @@ RB_AUTOBOOT
/* Parse and handle arguments */
opt_complementary = "d+"; /* -d N */
- flags = getopt32(argv, "d:nfw", &delay);
+ flags = getopt32(argv, "d:nf" USE_FEATURE_WTMP("w"), &delay);
sleep(delay);
@@ -63,10 +63,11 @@ RB_AUTOBOOT
if (uname(&uts) == 0)
safe_strncpy(utmp.ut_host, uts.release, sizeof(utmp.ut_host));
updwtmp(bb_path_wtmp_file, &utmp);
-#endif /* !ENABLE_FEATURE_WTMP */
if (flags & 8) /* -w */
return EXIT_SUCCESS;
+#endif /* !ENABLE_FEATURE_WTMP */
+
if (!(flags & 2)) /* no -n */
sync();