2005-07-05 Shaun Jackman <sjackman@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.

1 files changed, 8 insertions, 0 deletions

diff --git a/init/Config.in b/init/Config.in
index 4465e75a1..521f8fe1d 100644
--- a/init/Config.in
+++ b/init/Config.in
@@ -35,6 +35,14 @@ config CONFIG_FEATURE_INIT_COREDUMPS
           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