Removed expect dependency
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12340 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		@@ -164,6 +164,7 @@ for i in `ls *.rpm|grep -v -E '^tcl-|^tk-|^expect-|^unixODBC-|^xCAT-UI-deps|^per
 | 
			
		||||
	rpm -Uvh $opts $i
 | 
			
		||||
done
 | 
			
		||||
# don't try to install tcl, tk, or expect if they are already installed!
 | 
			
		||||
# this section about expect/tcl/tk can be removed once 2.8 releases, because 2.8 no longer requires expect
 | 
			
		||||
lslpp -l | grep expect.base > /dev/null 2>&1
 | 
			
		||||
if [ $? -gt 0 ]; then
 | 
			
		||||
	if [ "$OSVER" == "5.3" ]; then
 | 
			
		||||
 
 | 
			
		||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -1,35 +0,0 @@
 | 
			
		||||
#!/usr/bin/env expect
 | 
			
		||||
 | 
			
		||||
set timeout 45
 | 
			
		||||
 | 
			
		||||
set bcmm [lindex $argv 0]
 | 
			
		||||
set bayno [lindex $argv 1]
 | 
			
		||||
set username [lindex $argv 2]
 | 
			
		||||
set password [lindex $argv 3]
 | 
			
		||||
set cmdline "console -o -T blade\[$bayno\]"
 | 
			
		||||
 | 
			
		||||
spawn telnet $bcmm
 | 
			
		||||
expect -re ".*username: "
 | 
			
		||||
send "$username\r"
 | 
			
		||||
expect -re ".*password: "
 | 
			
		||||
send "$password\r"
 | 
			
		||||
expect -re ".*system> "
 | 
			
		||||
send "$cmdline\r"
 | 
			
		||||
expect {
 | 
			
		||||
	eof {
 | 
			
		||||
		exit
 | 
			
		||||
	}
 | 
			
		||||
	-re ".*system> " { 
 | 
			
		||||
		sleep 5
 | 
			
		||||
		send "$cmdline\r"
 | 
			
		||||
	}
 | 
			
		||||
	"?" {
 | 
			
		||||
		interact {
 | 
			
		||||
			-o
 | 
			
		||||
			"system> " { 
 | 
			
		||||
				sleep 5
 | 
			
		||||
				send "$cmdline\r"
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,17 +0,0 @@
 | 
			
		||||
#!/usr/bin/expect -f
 | 
			
		||||
# 
 | 
			
		||||
# © Copyright 2009 Hewlett-Packard Development Company, L.P.
 | 
			
		||||
# EPL license http://www.eclipse.org/legal/epl-v10.html
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
set send_slow {1 0.02}
 | 
			
		||||
 | 
			
		||||
expect "</<hpiLO->"
 | 
			
		||||
sleep 5
 | 
			
		||||
 | 
			
		||||
send -s "vsp"
 | 
			
		||||
sleep 1
 | 
			
		||||
 | 
			
		||||
send "\r"
 | 
			
		||||
 | 
			
		||||
exit 0
 | 
			
		||||
@@ -24,7 +24,7 @@ Conflicts: xCATsn
 | 
			
		||||
Requires: xCAT-server xCAT-client perl-DBD-SQLite
 | 
			
		||||
 | 
			
		||||
%ifos linux
 | 
			
		||||
Requires: dhcp httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd perl(CGI)
 | 
			
		||||
Requires: dhcp httpd nfs-utils nmap fping bind perl-XML-Parser vsftpd perl(CGI)
 | 
			
		||||
Requires: /etc/xinetd.d/tftp
 | 
			
		||||
%ifarch s390x
 | 
			
		||||
# No additional requires for zLinux right now
 | 
			
		||||
 
 | 
			
		||||
@@ -25,7 +25,7 @@ Conflicts: xCAT
 | 
			
		||||
 | 
			
		||||
%ifos linux
 | 
			
		||||
# yaboot-xcat is pulled in so any SN can manage ppc nodes
 | 
			
		||||
Requires: dhcp httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd
 | 
			
		||||
Requires: dhcp httpd nfs-utils nmap fping bind perl-XML-Parser vsftpd
 | 
			
		||||
%ifarch ppc64
 | 
			
		||||
Requires: perl-IO-Stty
 | 
			
		||||
%endif
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user