X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fbootscripts%2Ffunctions;h=90d0c03fc8cb75dffc6f9aa27be0887a73d13cf0;hb=fc7d8c678ca78bef7c6e7eaeeb579269b7c501be;hp=f7dfc18968c4219a29a1986a1ef5990aa2ae7553;hpb=ff51e86b74e8e6256f01eca359b5b7b8c570b68d;p=hvlinux.git diff --git a/stage1/bootscripts/functions b/stage1/bootscripts/functions index f7dfc18..90d0c03 100644 --- a/stage1/bootscripts/functions +++ b/stage1/bootscripts/functions @@ -14,7 +14,7 @@ export PATH="/tools/bin:/tools/sbin:/bin:/sbin" ## Screen Dimensions # Find current screen size if [ -z "${COLUMNS}" ]; then - COLUMNS=$(stty size) + COLUMNS=$(stty size < /dev/console) COLUMNS=${COLUMNS##* } fi @@ -449,7 +449,7 @@ reloadproc() if [ ${?} -ne 0 ]; then sleep 2 - if statusproc ${base} | grep -q "not running"; then + if statusproc ${base} | grep -q "stopped"; then return ${EXIT_CODE_FAILURE} fi fi @@ -510,10 +510,11 @@ statusproc_path() if [ -f ${piddir}/${base}.pid ]; then pid=$(head -1 ${piddir}/${base}.pid) if [ -n "${pid}" ]; then - echo "${base} not running but ${piddir}/${base}.pid exists" + echo "${base} stopped but ${piddir}/${base}.pid exists" return ${EXIT_CODE_FAILURE} fi - else - echo "${base} is not running" fi + + echo "${base} is stopped" + return ${EXIT_CODE_FAILURE} }