diff --git a/xCAT-client/pods/man1/rbootseq.1.pod b/xCAT-client/pods/man1/rbootseq.1.pod index 7a5c491ea..a81eee0f0 100644 --- a/xCAT-client/pods/man1/rbootseq.1.pod +++ b/xCAT-client/pods/man1/rbootseq.1.pod @@ -11,6 +11,10 @@ B [B<-h>|B<--help>|B<-v>|B<--version>] B I {B|B|B|B|B|B|B|B|B|B|B|B|B}B<,>I<...> +=head2 HP Blade specific: + +B I {B|B|B|B|B|B|B|B|B}B<,>I<...> + =head2 PPC (using Direct FSP Management) specific: B I B<[hfi|net]> @@ -52,6 +56,22 @@ The fourth hard disk. Boot over the ethernet network, using a PXE or BOOTP broadcast. +=item B|B|B|B|B (HP Blade Only) + +Boot over the first ethernet network, using a PXE or BOOTP broadcast. + +=item B|B (HP Blade Only) + +Boot over the second ethernet network, using a PXE or BOOTP broadcast. + +=item B|B (HP Blade Only) + +Boot over the third ethernet network, using a PXE or BOOTP broadcast. + +=item B|B (HP Blade Only) + +Boot over the fourth ethernet network, using a PXE or BOOTP broadcast. + =item B Boot p775 nodes over the HFI network, using BOOTP broadcast. @@ -68,7 +88,7 @@ Boot to an iSCSI disk over the network. The CD or DVD drive. -=item B|B|B +=item B|B|B A USB flash drive. diff --git a/xCAT-server/lib/xcat/plugins/hpblade.pm b/xCAT-server/lib/xcat/plugins/hpblade.pm index 1322d2708..156de8071 100755 --- a/xCAT-server/lib/xcat/plugins/hpblade.pm +++ b/xCAT-server/lib/xcat/plugins/hpblade.pm @@ -90,21 +90,30 @@ my %bootnumbers = ( 'f' => 2, 'floppy' => 2, 'usb' => 3, + 'usbflash' => 3, + 'flash' => 3, 'h' => 4, 'hd' => 4, 'hdd' => 4, + 'hd0' => 4, 'harddisk' => 4, 'eth0' => 5, 'nic1' => 5, + 'net1' => 5, + 'net' => 5, + 'n' => 5, 'pxe_nic1' => 5, 'eth1' => 6, 'nic2' => 6, + 'net2' => 6, 'pxe_nic2' => 6, 'eth2' => 7, 'nic3' => 7, + 'net3' => 7, 'pxe_nic3' => 7, 'eth3' => 8, 'nic4' => 8, + 'net4' => 8, 'pxe_nic4' => 8 ); diff --git a/xCAT-server/share/xcat/cons/hpblade b/xCAT-server/share/xcat/cons/hpblade index eb572075d..2bb0efd34 100755 --- a/xCAT-server/share/xcat/cons/hpblade +++ b/xCAT-server/share/xcat/cons/hpblade @@ -109,7 +109,7 @@ until ($mm and $username and $slot) { } release_lock(); #done with xcatd, can run with near impunity $sleepint=10+int(rand(30)); #Stagger sleep to take it easy on AMM/hosting server -exec "ssh -t $username"."@"."$mm"; +exec "ssh -t $username"."@"."$mm vsp"; my $pathtochild= dirname($scriptname). "/"; #exec $pathtochild."hpblade.expect";