Compare commits

..

No commits in common. "58f45494af5a602707fde174f5d59a802b74e017" and "d8f8aa9cb0819b74066b2d8ea26c1be539cebf36" have entirely different histories.

@ -140,7 +140,7 @@ ina3221_ch2_volt="0"
ina3221_ch0_current="0" ina3221_ch0_current="0"
ina3221_ch1_current="0" ina3221_ch1_current="0"
ina3221_ch2_current="0" ina3221_ch2_current="0"
SCRIPT_VERSION="1.7.3" SCRIPT_VERSION="1.7.2"
fru_file_name=$option_data2 fru_file_name=$option_data2
fru_write_size=0 fru_write_size=0
@ -252,10 +252,10 @@ parse_nic_slot(){
esac esac
if [ $nic_type = "ocp" ];then if [ $nic_type = "ocp" ];then
slot_number=$(echo $nic_slot | cut -b 4-) slot_number=$(echo $nic_slot | cut -c 4)
else else
if [ $fullname -eq 1 ];then if [ $fullname -eq 1 ];then
slot_number=$(echo $nic_slot | cut -b 5-) slot_number=$(echo $nic_slot | cut -c 5)
else else
slot_number=$nic_slot slot_number=$nic_slot
fi fi
@ -269,7 +269,7 @@ try_get_server_type(){
if [ -e "/tmp/ns_servertype" ];then if [ -e "/tmp/ns_servertype" ];then
server_type=`cat /tmp/ns_servertype` server_type=`cat /tmp/ns_servertype`
else else
boardid=`cat /proc/cmdline | awk -F 'boardid=' '{split($2, a," "); print a[1]}'` boardid=`cat /proc/cmdline | awk -F'=' '/boardid=/{print $8; exit}'`
if [ $boardid -eq 130 ];then if [ $boardid -eq 130 ];then
server_type="5280m7" server_type="5280m7"