From 747bd7ecb1ac4f51756df2d2bcb936f51360229e Mon Sep 17 00:00:00 2001 From: ligc Date: Wed, 2 Jun 2010 08:02:54 +0000 Subject: [PATCH] rnetboot support for IPv6 git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6307 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/sbin/lpar_netboot.expect | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/xCAT-server/sbin/lpar_netboot.expect b/xCAT-server/sbin/lpar_netboot.expect index 0394100cd..f8ec75f4f 100644 --- a/xCAT-server/sbin/lpar_netboot.expect +++ b/xCAT-server/sbin/lpar_netboot.expect @@ -1435,9 +1435,17 @@ proc boot_network {} { set pattern(0) "iSCSI" } else { if {$extra_args != "" } { - set net_device(0) "$full_path_name:speed=$speed,duplex=$duplex,bootp,$server_ip,,$client_ip,$gateway_ip $extra_args" + if { [regexp ":" $server_ip]!=0 } { #ipv6 + set net_device(0) "$full_path_name:ipv6,speed=$speed,duplex=$duplex,siaddr=$server_ip,ciaddr=$client_ip,giaddr=$gateway_ip,filename=$NODENAME,$extra_args" + } else { + set net_device(0) "$full_path_name:speed=$speed,duplex=$duplex,bootp,$server_ip,,$client_ip,$gateway_ip $extra_args" + } } else { - set net_device(0) "$full_path_name:speed=$speed,duplex=$duplex,bootp,$server_ip,,$client_ip,$gateway_ip" + if { [regexp ":" $server_ip]!=0 } { #ipv6 + set net_device(0) "$full_path_name:ipv6,speed=$speed,duplex=$duplex,siaddr=$server_ip,ciaddr=$client_ip,giaddr=$gateway_ip,filename=$NODENAME" + } else { + set net_device(0) "$full_path_name:speed=$speed,duplex=$duplex,bootp,$server_ip,,$client_ip,$gateway_ip" + } } set pattern(0) "BOOTP" } @@ -1529,6 +1537,10 @@ proc boot_network {} { nc_msg $msg($state) set state $newstate($state) } + -re "----" { + nc_msg $msg($state) + set state $newstate($state) + } -re "]" { send_user "$PROGRAM: Unexpected prompt\n" set rc 1