mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-10-31 19:32:31 +00:00 
			
		
		
		
	-Continue making primarynic an optional value
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5959 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		| @@ -2,10 +2,17 @@ | ||||
| # Setup hostname | ||||
| # | ||||
| echo "post scripts" >/root/post.log | ||||
| export PRINIC=#TABLE:noderes:THISNODE:primarynic# | ||||
| export PRINIC=#TABLEBLANKOKAY:noderes:THISNODE:primarynic# | ||||
| if [ -z "$PRINIC" ] | ||||
| then | ||||
|     export PRINIC=eth0 | ||||
|     for karg in $(cat /proc/cmdline |sed -e 's/ /\n/g'); do | ||||
|         if  [ "${karg%%=*}" = "BOOTIF" ]; then | ||||
|             export PRINIC=`ifconfig -a|grep -i "hwaddr ${karg#*=}"|awk '{print $1}'` | ||||
|         fi | ||||
|     done | ||||
|     if [ -z "$PRINIC" ]; then | ||||
|         export PRINIC=eth0 | ||||
|     fi | ||||
| fi | ||||
| IP=$(ifconfig $PRINIC | grep inet | awk '{print $2}' | awk -F: '{print $2}') | ||||
| if [ -z $IP ] | ||||
|   | ||||
| @@ -2,10 +2,21 @@ | ||||
| # Setup hostname | ||||
| # | ||||
| echo "post scripts" >/root/post.log | ||||
| export PRINIC=#TABLE:noderes:THISNODE:primarynic# | ||||
| export PRINIC=#TABLEBLANKOKAY:noderes:THISNODE:primarynic# | ||||
| if [ "$PRINIC" == "mac"] | ||||
| then | ||||
|     export PRINIC=#TABLE:mac:THISNODE:mac# | ||||
|     export PRINIC="#TABLE:mac:THISNODE:mac#" | ||||
| fi | ||||
| if [ -z "$PRINIC" ] | ||||
| then | ||||
|     for karg in $(cat /proc/cmdline |sed -e 's/ /\n/g'); do | ||||
|         if  [ "${karg%%=*}" = "BOOTIF" ]; then | ||||
|             export PRINIC=`ifconfig -a|grep -i "hwaddr ${karg#*=}"|awk '{print $1}'` | ||||
|         fi | ||||
|     done | ||||
|     if [ -z "$PRINIC" ]; then | ||||
|         export PRINIC=eth0 | ||||
|     fi | ||||
| fi | ||||
| if [ -z "$PRINIC" ] | ||||
| then | ||||
|   | ||||
| @@ -2,10 +2,27 @@ | ||||
| # Setup hostname | ||||
| # | ||||
| echo "post scripts" >/root/post.log | ||||
| export PRINIC=#TABLE:noderes:THISNODE:primarynic# | ||||
| export PRINIC=#TABLEBLANKOKAY:noderes:THISNODE:primarynic# | ||||
| if [ "$PRINIC" == "mac"] | ||||
| then | ||||
|     export PRINIC="#TABLE:mac:THISNODE:mac#" | ||||
| fi | ||||
| if [ -z "$PRINIC" ] | ||||
| then | ||||
|     for karg in $(cat /proc/cmdline |sed -e 's/ /\n/g'); do | ||||
|         if  [ "${karg%%=*}" = "BOOTIF" ]; then | ||||
|             export PRINIC=`ifconfig -a|grep -i "hwaddr ${karg#*=}"|awk '{print $1}'` | ||||
|         fi | ||||
|     done | ||||
|     if [ -z "$PRINIC" ]; then | ||||
|         export PRINIC=eth0 | ||||
|     fi | ||||
| fi | ||||
| if [ -z "$PRINIC" ] | ||||
| then | ||||
|     export PRINIC=eth0 | ||||
| elif [[ `echo "$PRINIC" | grep -sqE ^[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+$ ;echo $?` == "0" ]]; then | ||||
|     export PRINIC=`ifconfig -a | grep -i "HWaddr $PRINIC" | awk '{print $1}'` | ||||
| fi | ||||
| IP=$(ifconfig $PRINIC | grep inet | awk '{print $2}' | awk -F: '{print $2}') | ||||
| if [ -z $IP ] | ||||
|   | ||||
| @@ -16,12 +16,24 @@ BOOTPROTO=dhcp | ||||
| STARTMODE=onboot | ||||
| EOF | ||||
|  | ||||
| export PRINIC=#TABLE:noderes:$NODE:primarynic# | ||||
| export PRINIC=#TABLEBLANKOKAY:noderes:THISNODE:primarynic# | ||||
| if [ "$PRINIC" == "mac"] | ||||
| then | ||||
|     export PRINIC=#TABLE:mac:$NODE:mac# | ||||
|     export PRINIC="#TABLE:mac:THISNODE:mac#" | ||||
| fi | ||||
| if [ -z "$PRINIC" ]; then | ||||
| if [ -z "$PRINIC" ] | ||||
| then | ||||
|     for karg in $(cat /proc/cmdline |sed -e 's/ /\n/g'); do | ||||
|         if  [ "${karg%%=*}" = "BOOTIF" ]; then | ||||
|             export PRINIC=`ifconfig -a|grep -i "hwaddr ${karg#*=}"|awk '{print $1}'` | ||||
|         fi | ||||
|     done | ||||
|     if [ -z "$PRINIC" ]; then | ||||
|         export PRINIC=eth0 | ||||
|     fi | ||||
| fi | ||||
| if [ -z "$PRINIC" ] | ||||
| then | ||||
|     export PRINIC=eth0 | ||||
| elif [[ `echo "$PRINIC" | grep -sqE ^[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+$ ;echo $?` == "0" ]]; then | ||||
|     export PRINIC=`ifconfig -a | grep -i "HWaddr $PRINIC" | awk '{print $1}'` | ||||
|   | ||||
| @@ -16,12 +16,24 @@ BOOTPROTO=dhcp | ||||
| STARTMODE=onboot | ||||
| EOF | ||||
|  | ||||
| export PRINIC=#TABLE:noderes:$NODE:primarynic# | ||||
| export PRINIC=#TABLEBLANKOKAY:noderes:THISNODE:primarynic# | ||||
| if [ "$PRINIC" == "mac"] | ||||
| then | ||||
|     export PRINIC=#TABLE:mac:$NODE:mac# | ||||
|     export PRINIC="#TABLE:mac:THISNODE:mac#" | ||||
| fi | ||||
| if [ -z "$PRINIC" ]; then | ||||
| if [ -z "$PRINIC" ] | ||||
| then | ||||
|     for karg in $(cat /proc/cmdline |sed -e 's/ /\n/g'); do | ||||
|         if  [ "${karg%%=*}" = "BOOTIF" ]; then | ||||
|             export PRINIC=`ifconfig -a|grep -i "hwaddr ${karg#*=}"|awk '{print $1}'` | ||||
|         fi | ||||
|     done | ||||
|     if [ -z "$PRINIC" ]; then | ||||
|         export PRINIC=eth0 | ||||
|     fi | ||||
| fi | ||||
| if [ -z "$PRINIC" ] | ||||
| then | ||||
|     export PRINIC=eth0 | ||||
| elif [[ `echo "$PRINIC" | grep -sqE ^[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+$ ;echo $?` == "0" ]]; then | ||||
|     export PRINIC=`ifconfig -a | grep -i "HWaddr $PRINIC" | awk '{print $1}'` | ||||
|   | ||||
		Reference in New Issue
	
	Block a user