From 47c6322b87a10d2ef9226ca4d5d677ae936712d4 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Fri, 20 Aug 2010 13:04:40 +0000 Subject: [PATCH] -More IPv6 stuff for esxi (implement prototype DUID-UUID) git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7168 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- .../share/xcat/netboot/esxi/38.xcat-enableipv6 | 13 +++++++++++++ .../share/xcat/netboot/esxi/47.xcat-networking | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/xCAT-server/share/xcat/netboot/esxi/38.xcat-enableipv6 b/xCAT-server/share/xcat/netboot/esxi/38.xcat-enableipv6 index 86d816ffb..bdf7193da 100644 --- a/xCAT-server/share/xcat/netboot/esxi/38.xcat-enableipv6 +++ b/xCAT-server/share/xcat/netboot/esxi/38.xcat-enableipv6 @@ -1,6 +1,19 @@ #!/bin/sh retval=${SUCCESS} if [ `uname -r` == '4.1.0' ]; then + #duid=default-duid "\000\001\000\001LnC\304\000\020\030^\340\334"; + duid='default-duid "\000\004'; + + for i in `vsish -e get /hardware/machineUUID|grep \\\[|sed -e 's/.*://'|sed -e ':a;N;$!ba;s/\n//g'`; do + num=`printf "%d" $i` + tnum=`printf "\\%03o" $i` + if [ $num -lt 127 -a $num -gt 31 ]; then + tnum=`printf $tnum` + fi + duid=$duid$tnum + done + duid=$duid'";' + echo $duid > /etc/dhclient6-vmk0.leases Exec esxcfg-advcfg -S 1 -U IPv6ConfigSet Exec esxcfg-module -s "ipv6=1" tcpip3 fi diff --git a/xCAT-server/share/xcat/netboot/esxi/47.xcat-networking b/xCAT-server/share/xcat/netboot/esxi/47.xcat-networking index 6691d9a8b..14f262d2a 100644 --- a/xCAT-server/share/xcat/netboot/esxi/47.xcat-networking +++ b/xCAT-server/share/xcat/netboot/esxi/47.xcat-networking @@ -12,8 +12,9 @@ if [ ! -z "$MACADDR" ]; then esxcfg-vswitch -a vSwitch0:64 esxcfg-vswitch -A "Management Network" vSwitch0 esxcfg-vswitch -L $NIC vSwitch0 - esxcfg-vmknic -a -i DHCP -i DHCPV6 -P -p "Management Network" + esxcfg-vmknic -a -i DHCP -P -p "Management Network" esxcfg-init -R $MACADDR -K vmk0 + esxcfg-vmknic -i DHCPV6 "Management Network" fi sed -ie 's/#ssh/ssh/' /etc/inetd.conf #ssh is too nice not to have