Add wireless client for RED to startup process.

[ipfire-2.x.git] / src / initscripts / init.d / functions

diff --git a/src/initscripts/init.d/functions b/src/initscripts/init.d/functions
index 3a759525f57f5c3cd741965818706380466fd17d..e2e058d38b9d081aea1519d91e8a3832a4b9b02c 100644 (file)
--- a/src/initscripts/init.d/functions
+++ b/src/initscripts/init.d/functions
@@ -22,12 +22,12 @@ export PATH="/bin:/usr/bin:/sbin:/usr/sbin"
 RELOADSIG="HUP"
 
 # Number of seconds between STOPSIG and FALLBACK when stopping processes
-KILLDELAY="5"
+KILLDELAY="10"
 
 ## Screen Dimensions
 # Find current screen size
 if [ -z "${COLUMNS}" ]; then
-       COLUMNS=$(stty size)
+       COLUMNS=$(stty size 2>/dev/null)
        COLUMNS=${COLUMNS##* }
 fi
 
@@ -155,9 +155,9 @@ print_error_msg()
        boot_mesg -n " ipfire, please be so kind to inform us at"
        boot_mesg " info@ipfire.org.\n"
        boot_mesg_flush
-       boot_mesg -n "Press Enter to continue or wait 3 minutes..." ${INFO}
+       boot_mesg -n "Press Enter to continue or wait a minute..." ${INFO}
        boot_mesg "" ${NORMAL}
-       read -t 180 ENTER
+       read -t 60 ENTER
 }
 
 check_script_status()
@@ -438,7 +438,7 @@ loadproc()
 {
        local pidfile=""
        local forcestart=""
-       local nicelevel="10"
+       local nicelevel=""
 
 # This will ensure compatibility with previous LFS Bootscripts
        if [ -n "${PIDFILE}" ]; then
@@ -500,7 +500,13 @@ loadproc()
                esac
        fi
 
-       nice -n "${nicelevel}" "${@}"
+       local cmd="${@}"
+
+       if [ -n "${nicelevel}" ]; then
+               cmd="nice -n "${nicelevel}" ${cmd}"
+       fi
+
+       ${cmd}
        evaluate_retval # This is "Probably" not LSB compliant, but required to be compatible with older bootscripts
        return 0
 }