Re: {bb} Some bugs on bb-prtdiag 4.7 ?

[Uwe Kirbach <uwe.kirbach@arcor.de>]

Am Donnerstag, den 01.09.2005, 19:28 +0200 schrieb Uwe Kirbach:
> Am Mittwoch, den 31.08.2005, 10:20 -0400 schrieb Ricardo Stella:
> > Trying to figure out why it would think that a Sun-Fire-V240 would not
> > have temperature probes.
> > 
> > There's code that seems to be uncommented when it should be around line
> > 415, and eventually it seems to set EXCLUDE to MACHINETYPE, therefore
> > temp checks (and other stuff) won't be performed...
> 
> Hello list,
> 
> shame on me -> i introduced this logical bug
> together with new server types from Fujitsu-Siemens (FSC).
> 
> Attached is a patch bb-prtdiag_4.7.1.patch to correct this
> (+ some minor changes for FSC machines)
> and the complete script as bb-prtdiag_4.7.1.sh
> 
> The main difference is:
> In bb-prtdiag-4.7 the lines 402-426 (#No Temperature...) have
> to be moved inside the
> check for FSC machines (case $MACHINETYPE in GPU* ...)
> 
> Sorry to have caused you inconvienience.
> 
> 
> Hello Craig,
> please could you as maintainer of bb-prtdiag include this
> patch into the source tree ?
> Thanks a lot
> 
> Uwe Kirbach
> 
> PS: My first post from work seems not reached the list.

This is my third try to send my patch to the list.

I assume attachments will be filtered out.
That's why i include the patch for bb-prtdiag.sh ver. 4.7 directly
into this mail:
------------------------------------------------------------------
--- bb-prtdiag_4.7.sh   2005-06-03 17:27:51.000000000 +0200
+++ bb-prtdiag_4.7.1.sh 2005-07-28 13:56:00.000000000 +0200
@@ -337,7 +337,7 @@
   MACHINETYPE=`echo $PLATFORM_SPEC | $SED 's/.*,//'`

   #check to see if hardware supports temperature checks
-  EXCLUDE=`echo $EXCLUDE_SYSTEMS | $EGREP "$MACHINETYPE"`
+  EXCLUDE=`echo $EXCLUDE_SYSTEMS | $EGREP -e
"$MACHINETYPE([[:blank:]]+|$)"`

   #####
   #####  Diagnostic Information and more CPU/Memory Info.
@@ -396,13 +396,8 @@
                        CHECK_TEMPERATURE="N"
                  fi
            fi
-        ;;
-     esac

      # No Temperature
-     # some PrimePower 200 don't have Temperature sensors
-     #if [ "$MACHINETYPE" = "GPUS" ]; then
-     # FSC PrimePower 200 or PrimePower 400
      # some PrimePower 200 (such PP200 with 602MHz CPUs) have
temperature sensors
      # and some not (such PP200 with 400MHz CPUs) - Don't know, why ...

@@ -412,17 +407,18 @@
       # but they may have, if unpartitioned
      #PP_200=`$GREP "PRIMEPOWER 200" $PRTFILE`
      ##TEMPS=`$EGREP '^(Motherboard#[0-9])' $PRTFILE | $AWK '{print $1,
$2}'`
+        #
+        # This is common to all types
      TEMPS=`$EGREP 'System Temperature' $PRTFILE`
-     #if [ "x$PP_200" != "x" -a "$TEMPS" = "" ]; then               #
PrimePower 200
      if [ "$TEMPS" = "" ]; then
         EXCLUDE="$MACHINETYPE"
      fi
         if [ "$DEBUG" = "Y" ]; then
-           #echo "PP_200=$PP_200"
            echo "TEMPS=$TEMPS"
            echo "EXCLUDE=$EXCLUDE"
         fi
-     #fi
+        ;;
+     esac
   fi
   # FSC Primepower Specials End

@@ -739,10 +735,6 @@

 get_PP200_400_600_data ()
 {
-  # prtdiag in SunOS 5.9 has no "Environmental Status" - only SunOS 5.8
-  SunOS_PRTDIAG=`echo $PRT_FIRST_LINE |
-           $EGREP -e "Sun Microsystems[[:blank:]]+sun4us Fujitsu
Siemens PRIMEPOWER"`
-  if [ -z "$SunOS_PRTDIAG" ]; then
       ENV_TEXT=`$AWK '/.Environmental Status./, /^$/ {print $0}'
$PRTFILE | $EGREP -v "^$|Environmental Status"`

      BAD_LIGHTS=`echo $ENV_TEXT | $EGREP -v -e "MODE switch position|
Power Supplies:|Fans:"`
@@ -762,15 +754,10 @@
        echo "BAD_LIGHTS=$BAD_LIGHTS"
        echo "MODE_SWITCH=$MODE_SWITCH"
      fi
-  fi
 }

 get_PP1000_900_data ()
 {
-  # prtdiag in SunOS 5.9 has no "Environmental Status" - only SunOS 5.8
-  SunOS_PRTDIAG=`echo $PRT_FIRST_LINE |
-           $EGREP -e "Sun Microsystems[[:blank:]]+sun4us Fujitsu
Siemens PRIMEPOWER"`
-  if [ -z "$SunOS_PRTDIAG" ]; then
       ENV_TEXT=`$AWK '/.Environmental Status./, /^$/ {print $0}'
$PRTFILE | $EGREP -v -e "^$|Environmental Status|System PROM revisions|
^-*$|RST .* POST"`

      BAD_LIGHTS=`echo $ENV_TEXT | $GREP -v "MODE switch position"`
@@ -790,16 +777,11 @@
        echo "BAD_LIGHTS=$BAD_LIGHTS"
        echo "MODE_SWITCH=$MODE_SWITCH"
      fi
-  fi
 }

 get_PP250_450_650_850_data ()
 {
   PP_TYPE=$1
-  # prtdiag in SunOS 5.9 has no "Environmental Status" - only SunOS 5.8
-  SunOS_PRTDIAG=`echo $PRT_FIRST_LINE |
-           $EGREP -e "Sun Microsystems[[:blank:]]+sun4us Fujitsu
Siemens PRIMEPOWER"`
-  if [ -z "$SunOS_PRTDIAG" ]; then
       ENV_TEXT=`$AWK '/.Environmental Status./, /^$/ {print $0}'
$PRTFILE | $EGREP -v "^$|Environmental Status"`

      BAD_LIGHTS=`echo $ENV_TEXT | $GREP -v "MODE switch position"`
@@ -815,9 +797,9 @@
      #   if MODE_SWITCH == UNLOCK, then machine does not reboot after a
crash
      #   (auto-boot?=true is then useless at PP650 and PP850)
       #   but with MODE_SWITCH = LOCK you can not bring this machine
into OBP with <Stop-A>
-     if [ "$PP_TYPE" = "250_450" -a "$MODE_SWITCH" != "AUTO" ]; then
+     if [ "$PP_TYPE" = "250_450" -a "$MODE_SWITCH" != "UNLOCK" ]; then
        COLOR="yellow"
-       echo "${YELL_PIC} Mode switch postion = $MODE_SWITCH
(recommended AUTO) !!!" >> $YELLOWLINE
+       echo "${YELL_PIC} Mode switch postion = $MODE_SWITCH
(recommended UNLOCK) !!!" >> $YELLOWLINE
      fi
      if [ "$PP_TYPE" = "650_850" -a "$MODE_SWITCH" != "LOCK" ]; then
        COLOR="yellow"
@@ -828,7 +810,6 @@
        echo "BAD_LIGHTS=$BAD_LIGHTS"
        echo "MODE_SWITCH=$MODE_SWITCH"
      fi
-  fi
 }

 get_E250_data ()


--
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-==-=-=-=-=-=-=-=-=-=-=-=
To unsubscribe from this list, or to subscribe to the bb-digest list
send e-mail to mailto:majordomo@bb4.com with unsubscribe bb -and/or-
subscribe bb-digest in the BODY of the message.