From 9b3aaab75bcbbd6f9f0651a99651a8b552ee9c95 Mon Sep 17 00:00:00 2001 From: landley Date: Tue, 30 Aug 2005 18:17:05 +0000 Subject: Bug system entry #1 says that when busybox doesn't have swapoff, init shouldn't call swapoff. git-svn-id: svn://busybox.net/trunk/busybox@11290 69ca8d6d-28ef-0310-b511-8ec308f3f277 --- init/init.c | 4 +--- 1 file changed, 1 insertion(+), 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 */ -- cgit v1.2.3-55-g6feb