From 0df6d640f73b9c800566474568717ad679d7d328 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Sun, 9 Dec 2007 13:49:20 +0000
Subject: Use yesno more

---
 init.d/bootmisc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'init.d')

diff --git a/init.d/bootmisc b/init.d/bootmisc
index f57a708..5aa5f20 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
-- 
cgit v1.2.3