[Ceps-cvs] scripts hpsetup.sh,1.16,1.16.8.1

[<san...@us...>]

Update of /cvsroot/ceps/scripts
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29688

Modified Files:
      Tag: Work_3_25_Release
	hpsetup.sh 
Log Message:
Merging to Branch 3.25
Same as revision 1.17 used for hotfix-3-24_4



Index: hpsetup.sh
===================================================================
RCS file: /cvsroot/ceps/scripts/hpsetup.sh,v
retrieving revision 1.16
retrieving revision 1.16.8.1
diff -C2 -d -r1.16 -r1.16.8.1
*** hpsetup.sh	10 Oct 2005 03:59:43 -0000	1.16
--- hpsetup.sh	21 Aug 2008 11:13:28 -0000	1.16.8.1
***************
*** 6,9 ****
--- 6,21 ----
  #
  # $Log$
+ # Revision 1.16.8.1  2008/08/21 11:13:28  sanradha
+ # Merging to Branch 3.25
+ # Same as revision 1.17 used for hotfix-3-24_4
+ #
+ # Revision 1.17  2008/07/09 07:04:49  sanradha
+ # The code is modified to handle disappearance of DSS Fax Icon for
+ # printer models 4345 & 9040, when the Jetdirect card is rebooted
+ # as part of Hpsetup.
+ # If there are any printers which are 4345 or 9040, and if so do a
+ # Powercycle of printer instead of reboot of Jetdirect in Hpsetup.
+ # Implementer: Brijesh, Reviewer: Sanal, Krishna
+ #
  # Revision 1.16  2005/10/10 03:59:43  ravina
  # Changed npadmin to npadmin.pl to avoid npadmin --cfgsrc bug
***************
*** 137,140 ****
--- 149,153 ----
  fi
  
+ 
  if [ "$cfgsrc" != bootp ]
  then
***************
*** 146,151 ****
  # Reboot printer
  ping -c1 $DEVIP >/dev/null 2>&1
! snmpset -Os $DEVIP $USE_COMMUNITY $OID_REBOOT i 1 2>/dev/null
! sleep 5
  
  echo -n "Checking for correct settings "
--- 159,196 ----
  # Reboot printer
  ping -c1 $DEVIP >/dev/null 2>&1
! 
! unset main_amodel main_model check_model
! eval `echo dynip= $DEVIP | sddblist -t main -i dynip -a main_`
! echo "Model => $main_model /  $main_amodel"
! if [ -z "$main_model" -a -z "$main_amodel" ]
! then
!         echo "!!!Model field is not set for device \"$main_name\"."
!         echo " "
! else
! 	#if main model empty then try copying amodel in it
!         if [ -z "$main_model" ]
!         then
!                 main_model=$main_amodel
!                 echo "main_model=$main_amodel"
!         fi
! fi
!         check_model=`echo "$main_model" | grep -i hp | grep -v grep`
! 	echo "Model is $check_model \n"
!         if [ "$check_model" == "hplj9040mfp" -o "$check_model" == "hplj4345mfp" ]
!         then
! 	
!                 echo "Calling powerCycle for $check_model"
! 		powerCycle -r $DEVIP
! 	
! 		#We assume that 4345/9040 is not configured as manual IP. If it's manual we will change the mode to bootp in hpmfpsetup. 
! 		#Exiting from hpsetup and returning to ndscheck to calll hpmfpsetup. 
! 		#No need to check printer bootp status here because any way this will be configured in hpmfpsetup script later on..."
! 			
! 		exit 0
!         else
!                 echo "Other models, Calling jetdirect reboot"
! 		snmpset -Os $DEVIP $USE_COMMUNITY $OID_REBOOT i 1 2>/dev/null
! 		sleep 5
! 	fi
  
  echo -n "Checking for correct settings "