aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-12-09 13:49:20 +0000
committerRoy Marples <roy@marples.name>2007-12-09 13:49:20 +0000
commit0df6d640f73b9c800566474568717ad679d7d328 (patch)
tree562d64da4938d8982851d6327d684f5780c4e546
parent2c3c27e251231264b0eb37c968d36f0b4fd3c54b (diff)
Use yesno more
-rwxr-xr-xinit.d/bootmisc5
1 files changed, 2 insertions, 3 deletions
diff --git a/init.d/bootmisc b/init.d/bootmisc
index f57a7086..5aa5f200 100755
--- a/init.d/bootmisc
+++ b/init.d/bootmisc
@@ -29,7 +29,6 @@ depend() {
need localmount
before logger
after clock sysctl
- keywords notimeout
}
cleanup_tmp_dir() {
@@ -37,7 +36,7 @@ cleanup_tmp_dir() {
mkdir -p "${dir}"
cd "${dir}"
- if [ "${wipe_tmp}" = "yes" ]; then
+ if yesno ${wipe_tmp:-${WIPE_TMP:-yes}}; then
ebegin "Wiping ${dir} directory"
local startopts="-x . -depth"
[ "${RC_UNAME}" = "Linux" ] && startopts=". -xdev -depth"
@@ -73,7 +72,7 @@ cleanup_tmp_dir() {
start() {
# Put a nologin file in /etc to prevent people from logging
# in before system startup is complete.
- if [ "${DELAYLOGIN}" = "yes" ]; then
+ if yesno ${delay_login:-${DELAYLOGIN}}; then
echo "System bootup in progress - please wait" > /etc/nologin
cp /etc/nologin /etc/nologin.boot
fi