Commit ba915366 authored by Dan Reading's avatar Dan Reading
Browse files

remove some debugging. fix output string

parent ca44d90f
...@@ -175,10 +175,8 @@ case $os in ...@@ -175,10 +175,8 @@ case $os in
"IntelPentiumII") arch="i386" ;; "IntelPentiumII") arch="i386" ;;
* ) arch="Unknown" ;; * ) arch="Unknown" ;;
esac esac
echo $-
save_e save_e
set +e set +e
echo $-
x=$(grep 'FreeBSD/SMP:' /var/run/dmesg.boot | grep package) x=$(grep 'FreeBSD/SMP:' /var/run/dmesg.boot | grep package)
x=${x#FreeBSD/SMP: } x=${x#FreeBSD/SMP: }
[[ $x ]] && sockets=${x%%package*} || sockets=1 [[ $x ]] && sockets=${x%%package*} || sockets=1
...@@ -234,7 +232,7 @@ echo "" ...@@ -234,7 +232,7 @@ echo ""
# if saving data for testbed database # if saving data for testbed database
[[ ${x64bit} == 1 ]] && bits=64 || bits=32 [[ ${x64bit} == 1 ]] && bits=64 || bits=32
if [ -f ${logfile4tb} ] ; then if [ -f ${logfile4tb} ] ; then
printf "CPUINFO SOCKET=%s CORES=%s THREADS=%s SPEED=%s BITS=%s HV=%s\n"\ printf "CPUINFO SOCKETS=%s CORES=%s THREADS=%s SPEED=%s BITS=%s HV=%s\n"\
${sockets} ${cores_socket} ${threads_core} ${mhz} ${bits} ${hwvirt} >> ${logfile4tb} ${sockets} ${cores_socket} ${threads_core} ${mhz} ${bits} ${hwvirt} >> ${logfile4tb}
exit 0 exit 0
fi fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment