[BusyBox-cvs] svn commit: trunk/busybox/init

[vapier at busybox.net]

Author: vapier
Date: 2005-07-05 22:39:08 -0600 (Tue, 05 Jul 2005)
New Revision: 10721

Log:
2005-07-05  Shaun Jackman  <sjackman at gmail.com>

        * init/Config.in (CONFIG_FEATURE_INIT_SWAPON): New option.
        * init/init.c (check_memory): Disable the swapon feature unless
        CONFIG_FEATURE_INIT_SWAPON is defined.


Modified:
   trunk/busybox/init/Config.in
   trunk/busybox/init/init.c


Changeset:
Modified: trunk/busybox/init/Config.in
===================================================================
--- trunk/busybox/init/Config.in	2005-07-06 01:24:17 UTC (rev 10720)
+++ trunk/busybox/init/Config.in	2005-07-06 04:39:08 UTC (rev 10721)
@@ -35,6 +35,14 @@
 	  core file sizes.  If this option is disabled, processes
 	  will not generate any core files.
 
+config CONFIG_FEATURE_INIT_SWAPON
+	bool "  Should init run swapon if short on memory?"
+	default y
+	depends on CONFIG_INIT
+	help
+	  If the system has less than one megabyte of total memory, init
+	  will run '/sbin/swapon -a' to add swap memory.
+
 config CONFIG_FEATURE_EXTRA_QUIET
 	bool "  Should init be _extra_ quiet on boot?"
 	default y

Modified: trunk/busybox/init/init.c
===================================================================
--- trunk/busybox/init/init.c	2005-07-06 01:24:17 UTC (rev 10720)
+++ trunk/busybox/init/init.c	2005-07-06 04:39:08 UTC (rev 10721)
@@ -309,6 +309,7 @@
 	tcsetattr(fd, TCSANOW, &tty);
 }
 
+#ifdef CONFIG_FEATURE_INIT_SWAPON
 /* How much memory does this machine have?
    Units are kBytes to avoid overflow on 4GB machines */
 static unsigned int check_free_memory(void)
@@ -337,6 +338,7 @@
 		return(result * u);
 	}
 }
+#endif /* CONFIG_FEATURE_INIT_SWAPON */
 
 static void console_init(void)
 {
@@ -910,6 +912,7 @@
 	}
 }
 
+#ifdef CONFIG_FEATURE_INIT_SWAPON
 /* Make sure there is enough memory to do something useful. *
  * Calls "swapon -a" if needed so be sure /etc/fstab is present... */
 static void check_memory(void)
@@ -937,6 +940,9 @@
 	message(CONSOLE, "Sorry, your computer does not have enough memory.");
 	loop_forever();
 }
+#else
+# define check_memory()
+#endif /* CONFIG_FEATURE_INIT_SWAPON */
 
 /* NOTE that if CONFIG_FEATURE_USE_INITTAB is NOT defined,
  * then parse_inittab() simply adds in some default