diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-09-01 15:24:52 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-09-01 15:24:52 +0000 |
| commit | d93179fd5b6811cf5446a31146099c66c85db359 (patch) | |
| tree | 853bea712b8efd785e1a41d9894bece1b4973a92 /init | |
| parent | d129d7c3cdf1ce81c744dca4cc0c2659bf51cd3f (diff) | |
| download | busybox-w32-d93179fd5b6811cf5446a31146099c66c85db359.tar.gz busybox-w32-d93179fd5b6811cf5446a31146099c66c85db359.tar.bz2 busybox-w32-d93179fd5b6811cf5446a31146099c66c85db359.zip | |
- halt's -w depends on FEATURE_WTMP (Vladimir Dronnikov)
Diffstat (limited to 'init')
| -rw-r--r-- | init/halt.c | 15 |
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) | |||
| 20 | { | 20 | { |
| 21 | static const int magic[] = { | 21 | static const int magic[] = { |
| 22 | #ifdef RB_HALT_SYSTEM | 22 | #ifdef RB_HALT_SYSTEM |
| 23 | RB_HALT_SYSTEM, | 23 | RB_HALT_SYSTEM, |
| 24 | #elif defined RB_HALT | 24 | #elif defined RB_HALT |
| 25 | RB_HALT, | 25 | RB_HALT, |
| 26 | #endif | 26 | #endif |
| 27 | #ifdef RB_POWER_OFF | 27 | #ifdef RB_POWER_OFF |
| 28 | RB_POWER_OFF, | 28 | RB_POWER_OFF, |
| 29 | #elif defined RB_POWERDOWN | 29 | #elif defined RB_POWERDOWN |
| 30 | RB_POWERDOWN, | 30 | RB_POWERDOWN, |
| 31 | #endif | 31 | #endif |
| 32 | RB_AUTOBOOT | 32 | RB_AUTOBOOT |
| 33 | }; | 33 | }; |
| 34 | static const smallint signals[] = { SIGUSR1, SIGUSR2, SIGTERM }; | 34 | static const smallint signals[] = { SIGUSR1, SIGUSR2, SIGTERM }; |
| 35 | 35 | ||
| @@ -46,7 +46,7 @@ RB_AUTOBOOT | |||
| 46 | 46 | ||
| 47 | /* Parse and handle arguments */ | 47 | /* Parse and handle arguments */ |
| 48 | opt_complementary = "d+"; /* -d N */ | 48 | opt_complementary = "d+"; /* -d N */ |
| 49 | flags = getopt32(argv, "d:nfw", &delay); | 49 | flags = getopt32(argv, "d:nf" USE_FEATURE_WTMP("w"), &delay); |
| 50 | 50 | ||
| 51 | sleep(delay); | 51 | sleep(delay); |
| 52 | 52 | ||
| @@ -63,10 +63,11 @@ RB_AUTOBOOT | |||
| 63 | if (uname(&uts) == 0) | 63 | if (uname(&uts) == 0) |
| 64 | safe_strncpy(utmp.ut_host, uts.release, sizeof(utmp.ut_host)); | 64 | safe_strncpy(utmp.ut_host, uts.release, sizeof(utmp.ut_host)); |
| 65 | updwtmp(bb_path_wtmp_file, &utmp); | 65 | updwtmp(bb_path_wtmp_file, &utmp); |
| 66 | #endif /* !ENABLE_FEATURE_WTMP */ | ||
| 67 | 66 | ||
| 68 | if (flags & 8) /* -w */ | 67 | if (flags & 8) /* -w */ |
| 69 | return EXIT_SUCCESS; | 68 | return EXIT_SUCCESS; |
| 69 | #endif /* !ENABLE_FEATURE_WTMP */ | ||
| 70 | |||
| 70 | if (!(flags & 2)) /* no -n */ | 71 | if (!(flags & 2)) /* no -n */ |
| 71 | sync(); | 72 | sync(); |
| 72 | 73 | ||