From: Rob Landley <rob@landley.net>
Date: Tue, 30 Aug 2005 18:17:05 +0000 (-0000)
Subject: Bug system entry #1 says that when busybox doesn't have swapoff,
X-Git-Tag: 1_1_0~804
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7a8f6792f3a360756efccd6fbdb1f72db0108118;p=oweals%2Fbusybox.git

Bug system entry #1 says that when busybox doesn't have swapoff,
init shouldn't call swapoff.
---

diff --git a/init/init.c b/init/init.c
index 0f49a45d8..7656bf334 100644
--- a/init/init.c
+++ b/init/init.c
@@ -975,10 +975,8 @@ static void parse_inittab(void)
 		new_init_action(CTRLALTDEL, "/sbin/reboot", "");
 		/* Umount all filesystems on halt/reboot */
 		new_init_action(SHUTDOWN, "/bin/umount -a -r", "");
-#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
 		/* Swapoff on halt/reboot */
-		new_init_action(SHUTDOWN, "/sbin/swapoff -a", "");
-#endif
+		if(ENABLE_SWAPONOFF) new_init_action(SHUTDOWN, "/sbin/swapoff -a", "");
 		/* Prepare to restart init when a HUP is received */
 		new_init_action(RESTART, "/sbin/init", "");
 		/* Askfirst shell on tty1-4 */