svn commit: trunk/busybox/init

landley at busybox.net landley at busybox.net
Tue Aug 30 18:17:07 UTC 2005


Author: landley
Date: 2005-08-30 11:17:05 -0700 (Tue, 30 Aug 2005)
New Revision: 11290

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


Modified:
   trunk/busybox/init/init.c


Changeset:
Modified: trunk/busybox/init/init.c
===================================================================
--- trunk/busybox/init/init.c	2005-08-30 17:07:49 UTC (rev 11289)
+++ trunk/busybox/init/init.c	2005-08-30 18:17:05 UTC (rev 11290)
@@ -975,10 +975,8 @@
 		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 */




More information about the busybox-cvs mailing list