diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-12 15:59:35 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-12 15:59:35 +0000 |
| commit | e12c90217b8de612d2dfa429a71ad458b1754cf1 (patch) | |
| tree | 793d80cc84f4b956c0f3fe2e78f1f97fc59d4e99 | |
| parent | 51056b382a003146c879c9d50552d344f298d957 (diff) | |
| download | busybox-w32-e12c90217b8de612d2dfa429a71ad458b1754cf1.tar.gz busybox-w32-e12c90217b8de612d2dfa429a71ad458b1754cf1.tar.bz2 busybox-w32-e12c90217b8de612d2dfa429a71ad458b1754cf1.zip | |
halt/reboot/powerdown: accept and ignore -i
| -rw-r--r-- | init/halt.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/init/halt.c b/init/halt.c index 62f93c5cd..3a23ecabb 100644 --- a/init/halt.c +++ b/init/halt.c | |||
| @@ -63,9 +63,11 @@ int halt_main(int argc UNUSED_PARAM, char **argv) | |||
| 63 | 63 | ||
| 64 | /* Parse and handle arguments */ | 64 | /* Parse and handle arguments */ |
| 65 | opt_complementary = "d+"; /* -d N */ | 65 | opt_complementary = "d+"; /* -d N */ |
| 66 | /* We support -w even if !ENABLE_FEATURE_WTMP, in order | 66 | /* We support -w even if !ENABLE_FEATURE_WTMP, |
| 67 | * to not break scripts */ | 67 | * in order to not break scripts. |
| 68 | flags = getopt32(argv, "d:nfw", &delay); | 68 | * -i (shut down network interfaces) is ignored. |
| 69 | */ | ||
| 70 | flags = getopt32(argv, "d:nfwi", &delay); | ||
| 69 | 71 | ||
| 70 | sleep(delay); | 72 | sleep(delay); |
| 71 | 73 | ||
| @@ -89,10 +91,12 @@ int halt_main(int argc UNUSED_PARAM, char **argv) | |||
| 89 | if (ENABLE_FEATURE_CLEAN_UP) | 91 | if (ENABLE_FEATURE_CLEAN_UP) |
| 90 | free(pidlist); | 92 | free(pidlist); |
| 91 | } | 93 | } |
| 92 | if (rc) | 94 | if (rc) { |
| 93 | rc = kill(1, signals[which]); | 95 | rc = kill(1, signals[which]); |
| 94 | } else | 96 | } |
| 97 | } else { | ||
| 95 | rc = reboot(magic[which]); | 98 | rc = reboot(magic[which]); |
| 99 | } | ||
| 96 | 100 | ||
| 97 | if (rc) | 101 | if (rc) |
| 98 | bb_perror_nomsg_and_die(); | 102 | bb_perror_nomsg_and_die(); |