mirror of
https://github.com/sheumann/hush.git
synced 2024-12-27 01:32:08 +00:00
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.
This commit is contained in:
parent
72a4c33568
commit
95ef16528c
@ -35,6 +35,14 @@ config CONFIG_FEATURE_INIT_COREDUMPS
|
|||||||
core file sizes. If this option is disabled, processes
|
core file sizes. If this option is disabled, processes
|
||||||
will not generate any core files.
|
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
|
config CONFIG_FEATURE_EXTRA_QUIET
|
||||||
bool " Should init be _extra_ quiet on boot?"
|
bool " Should init be _extra_ quiet on boot?"
|
||||||
default y
|
default y
|
||||||
|
@ -309,6 +309,7 @@ static void set_term(int fd)
|
|||||||
tcsetattr(fd, TCSANOW, &tty);
|
tcsetattr(fd, TCSANOW, &tty);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_FEATURE_INIT_SWAPON
|
||||||
/* How much memory does this machine have?
|
/* How much memory does this machine have?
|
||||||
Units are kBytes to avoid overflow on 4GB machines */
|
Units are kBytes to avoid overflow on 4GB machines */
|
||||||
static unsigned int check_free_memory(void)
|
static unsigned int check_free_memory(void)
|
||||||
@ -337,6 +338,7 @@ static unsigned int check_free_memory(void)
|
|||||||
return(result * u);
|
return(result * u);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif /* CONFIG_FEATURE_INIT_SWAPON */
|
||||||
|
|
||||||
static void console_init(void)
|
static void console_init(void)
|
||||||
{
|
{
|
||||||
@ -910,6 +912,7 @@ static void delete_init_action(struct init_action *action)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_FEATURE_INIT_SWAPON
|
||||||
/* Make sure there is enough memory to do something useful. *
|
/* Make sure there is enough memory to do something useful. *
|
||||||
* Calls "swapon -a" if needed so be sure /etc/fstab is present... */
|
* Calls "swapon -a" if needed so be sure /etc/fstab is present... */
|
||||||
static void check_memory(void)
|
static void check_memory(void)
|
||||||
@ -937,6 +940,9 @@ static void check_memory(void)
|
|||||||
message(CONSOLE, "Sorry, your computer does not have enough memory.");
|
message(CONSOLE, "Sorry, your computer does not have enough memory.");
|
||||||
loop_forever();
|
loop_forever();
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
# define check_memory()
|
||||||
|
#endif /* CONFIG_FEATURE_INIT_SWAPON */
|
||||||
|
|
||||||
/* NOTE that if CONFIG_FEATURE_USE_INITTAB is NOT defined,
|
/* NOTE that if CONFIG_FEATURE_USE_INITTAB is NOT defined,
|
||||||
* then parse_inittab() simply adds in some default
|
* then parse_inittab() simply adds in some default
|
||||||
|
Loading…
Reference in New Issue
Block a user