xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-16 03:10:36 +00:00
Code Issues Releases Wiki Activity

modify depending on the comment

Browse Source
This commit is contained in:
huweihua
2015-11-23 23:18:07 -05:00
parent 939773081c
commit cb01dac7ae
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
xCAT-genesis-scripts/bin/getadapter Normal file → Executable file
View File

@ -8,13 +8,11 @@ export XCATPORT
ADAPTERFILE="/tmp/adapterinfo"
SCANNICLOG="/tmp/adapterscan.log"
if [ -f "$SCANNICLOG" ]; then
rm -f "$SCANNICLOG" 2>&1 >/dev/null
fi
rm -f "$SCANNICLOG" >/dev/null 2>&1
if [ -f "$ADAPTERFILE" ]; then
echo "rm -f $ADAPTERFILE" > "$SCANNICLOG"
rm -f "$ADAPTERFILE" 2>&1 >> "$SCANNICLOG"
rm -f "$ADAPTERFILE" >> "$SCANNICLOG" 2>&1
fi
@ -24,41 +22,42 @@ echo "<ClientType>cli</ClientType>" >> "$ADAPTERFILE"
echo "<hostname>$HOSTNAME</hostname>" >> "$ADAPTERFILE"
#scan adapters have recognized by operating system
for nic in `ls /sys/class/net/`; do
for n in /sys/class/net/*; do
nic=${n##/sys/class/net/}
if [ "$nic" == "lo" ]; then
continue
else
echo '<nic>' >> "$ADAPTERFILE"
tmp=`udevadm info /sys/class/net/"$nic" | grep " INTERFACE" | awk -F '=' '{print $2}'`
if [ ! -z "$tmp" ]; then
if [ -n "$tmp" ]; then
echo "<interface>$tmp</interface>" >> "$ADAPTERFILE"
fi
tmp=`udevadm info /sys/class/net/"$nic" | grep ID_NET_NAME | awk -F '=' '{print $2}'|sort -u| tr -s "\n" "," | sed "s/,$//g"`
if [ ! -z "$tmp" ]; then
if [ -n "$tmp" ]; then
echo "<predictablename>$tmp</predictablename>" >> "$ADAPTERFILE"
fi
tmp=`udevadm info /sys/class/net/"$nic" | grep DEVPATH | awk -F 'devices' '{print $2}'`
if [ ! -z "$tmp" ]; then
if [ -n "$tmp" ]; then
echo "<pcilocation>${tmp%/net*}</pcilocation>" >> "$ADAPTERFILE"
fi
tmp=`udevadm info /sys/class/net/"$nic" | grep ID_NET_NAME_MAC | awk -F '=' '{print $2}'`
if [ ! -z "$tmp" ]; then
if [ -n "$tmp" ]; then
echo "<mac>${tmp##*enx}</mac>" >> "$ADAPTERFILE"
fi
fi
tmp=`udevadm info /sys/class/net/"$nic" | grep ID_VENDOR_FROM_DATABASE | awk -F '=' '{print $2}' | tr -s "\n" "," | sed "s/,$//g"`
if [ ! -z "$tmp" ]; then
if [ -n "$tmp" ]; then
echo "<vendor>$tmp</vendor>" >> "$ADAPTERFILE"
fi
fi
tmp=`udevadm info /sys/class/net/"$nic" | grep ID_MODEL_FROM_DATABASE | awk -F '=' '{print $2}'`
if [ ! -z "$tmp" ]; then
if [ -n "$tmp" ]; then
echo "<model>$tmp</model>" >> "$ADAPTERFILE"
fi
echo '</nic>' >> "$ADAPTERFILE"
fi
done
for pci in `lspci |grep Ethernet |awk '{print $1}' `; do
if ! cat "$ADAPTERFILE" |grep "$pci" >/dev/null; then
for pci in `lspci |awk '/Ethernet/ {print $1}' `; do
if ! grep -q "$pci" "$ADAPTERFILE" 2 >/dev/null; then
tmp=`lspci |grep "$pci"`
echo '<nic>' >> "$ADAPTERFILE"
echo "<pcilocation>$pci</pcilocation>" >> "$ADAPTERFILE"
@ -67,8 +66,8 @@ for pci in `lspci |grep Ethernet |awk '{print $1}' `; do
fi
done
for pci in `lspci |grep Network |awk '{print $1}' `; do
if ! cat "$ADAPTERFILE" |grep "$pci" >/dev/null; then
for pci in `lspci |awk '/Network/ {print $1}' `; do
if ! grep -q "$pci" "$ADAPTERFILE" 2 >/dev/null; then
tmp=`lspci |grep "$pci"`
echo '<nic>' >> "$ADAPTERFILE"
echo "<pcilocation>$pci</pcilocation>" >> "$ADAPTERFILE"
@ -77,8 +76,8 @@ for pci in `lspci |grep Network |awk '{print $1}' `; do
fi
done
for pci in `lspci |grep Mellanox |awk '{print $1}' `; do
if ! cat "$ADAPTERFILE" |grep "$pci" >/dev/null; then
for pci in `lspci |awk '/Mellanox/ {print $1}' `; do
if ! grep -q "$pci" "$ADAPTERFILE" 2>/dev/null; then
tmp=`lspci |grep "$pci"`
echo '<nic>' >> "$ADAPTERFILE"
echo "<pcilocation>$pci</pcilocation>" >> "$ADAPTERFILE"
@ -89,7 +88,7 @@ done
echo "</xcatrequest>" >> "$ADAPTERFILE"
#cat "$ADAPTERFILE"
cat "$ADAPTERFILE"
if [ ! -z "$XCATMASTER" ]; then
if [ -f /etc/xcat/cert.pem -a -f /etc/xcat/certkey.pem ]; then #use client cert if available
@ -97,7 +96,7 @@ if [ ! -z "$XCATMASTER" ]; then
cat "$ADAPTERFILE" | openssl s_client -key /etc/xcat/certkey.pem -cert /etc/xcat/cert.pem -connect $XCATMASTER:$XCATPORT 2>&1 >>"$SCANNICLOG"
else
echo "transmit scan result without customer certificate to $XCATMASTER" >> "$SCANNICLOG"
cat "$ADAPTERFILE" | openssl s_client -connect $XCATMASTER:$XCATPORT 2>&1 >>"$SCANNICLOG"
cat "$ADAPTERFILE" | openssl s_client -connect $XCATMASTER:$XCATPORT 2>&1 >>"$SCANNICLOG"
fi
else
for dhcps in `cat /var/lib/dhclient/dhclient.leases |grep dhcp-server|awk '{print $3}'|uniq|sed "s/;$//g"`; do