From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Sun, 12 Apr 2009 15:59:35 +0000 (-0000)
Subject: halt/reboot/powerdown: accept and ignore -i
X-Git-Tag: 1_14_0~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e12c90217b8de612d2dfa429a71ad458b1754cf1;p=oweals%2Fbusybox.git

halt/reboot/powerdown: accept and ignore -i
---

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)
 
 	/* Parse and handle arguments */
 	opt_complementary = "d+"; /* -d N */
-	/* We support -w even if !ENABLE_FEATURE_WTMP, in order
-	 * to not break scripts */
-	flags = getopt32(argv, "d:nfw", &delay);
+	/* We support -w even if !ENABLE_FEATURE_WTMP,
+	 * in order to not break scripts.
+	 * -i (shut down network interfaces) is ignored.
+	 */
+	flags = getopt32(argv, "d:nfwi", &delay);
 
 	sleep(delay);
 
@@ -89,10 +91,12 @@ int halt_main(int argc UNUSED_PARAM, char **argv)
 			if (ENABLE_FEATURE_CLEAN_UP)
 				free(pidlist);
 		}
-		if (rc)
+		if (rc) {
 			rc = kill(1, signals[which]);
-	} else
+		}
+	} else {
 		rc = reboot(magic[which]);
+	}
 
 	if (rc)
 		bb_perror_nomsg_and_die();