summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2005-08-30 18:17:05 +0000
committerRob Landley <rob@landley.net>2005-08-30 18:17:05 +0000
commit7a8f6792f3a360756efccd6fbdb1f72db0108118 (patch)
treeff072b097d428bd4fa76c99c52d99c976a2c76a2
parent9a643149def4bcfe046ddc7863e315b217c7dc04 (diff)
Bug system entry #1 says that when busybox doesn't have swapoff,
init shouldn't call swapoff.
-rw-r--r--init/init.c4
1 files changed, 1 insertions, 3 deletions
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 */