projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move gperf from stage4 to stage 2 for eudev
[hvlinux.git]
/
stage1
/
bootscripts
/
functions
diff --git
a/stage1/bootscripts/functions
b/stage1/bootscripts/functions
index
f7dfc18
..
90d0c03
100644
(file)
--- 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
## Screen Dimensions
# Find current screen size
if [ -z "${COLUMNS}" ]; then
- COLUMNS=$(stty size)
+ COLUMNS=$(stty size
< /dev/console
)
COLUMNS=${COLUMNS##* }
fi
COLUMNS=${COLUMNS##* }
fi
@@
-449,7
+449,7
@@
reloadproc()
if [ ${?} -ne 0 ]; then
sleep 2
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
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
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
return ${EXIT_CODE_FAILURE}
fi
- else
- echo "${base} is not running"
fi
fi
+
+ echo "${base} is stopped"
+ return ${EXIT_CODE_FAILURE}
}
}