2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-20 10:10:22 +00:00

fix bug #3772, refine cases for encrypted_passwd to reduce the false error

This commit is contained in:
litingt@cn.ibm.com
2017-08-25 02:45:12 -04:00
parent b0249c798f
commit 680470c149

View File

@@ -4,6 +4,8 @@ cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod
check:rc==0
cmd:chtab key=system passwd.cryptmethod=md5
check:rc==0
cmd:copycds $$ISO
check:rc==0
cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
check:rc==0
cmd:grep '\$1\$' /install/autoinst/$$CN
@@ -76,6 +78,8 @@ cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod
check:rc==0
cmd:chtab key=system passwd.cryptmethod=sha256
check:rc==0
cmd:copycds $$ISO
check:rc==0
cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
check:rc==0
cmd:grep '\$5\$' /install/autoinst/$$CN
@@ -148,6 +152,8 @@ cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod
check:rc==0
cmd:chtab key=system passwd.cryptmethod=sha512
check:rc==0
cmd:copycds $$ISO
check:rc==0
cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
check:rc==0
cmd:grep '\$6\$' /install/autoinst/$$CN
@@ -225,9 +231,12 @@ cmd:chtab key=system passwd.username=root passwd.password=`openssl passwd -1 abc
check:rc==0
cmd:gettab key=system passwd.password > /tmp/tmpcryptedpasswd
check:rc==0
cmd:copycds $$ISO
check:rc==0
cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
check:rc==0
cmd:grep '\$1\$' /install/autoinst/$$CN |awk -F " " '{print $3}' > /tmp/instcryptedpasswd
cmd:if grep SUSE /etc/*release;then grep '\$1\$' /install/autoinst/c910f03c11k11 | awk 'gsub(/^ *| *$/,"")'| awk -v head="<user_password>" -v tail="</user_password>" '{print substr($0, index($0,head)+length(head),index($0,tail)-index($0,head)-length(head))}' > /tmp/instcryptedpasswd; elif grep "Red Hat" /etc/*release;then grep '\$1\$' /install/autoinst/$$CN |awk -F " " '{print $3}' > /tmp/instcryptedpasswd; elif grep Ubuntu /etc/*release;then grep '\$1\$' /install/autoinst/$$CN |awk -F " " '{print $4}' > /tmp/instcryptedpasswd;else echo "Sorry,this is not supported os"; fi
#cmd:grep '\$1\$' /install/autoinst/$$CN |awk -F " " '{print $3}' > /tmp/instcryptedpasswd
check:rc==0
cmd:diff /tmp/tmpcryptedpasswd /tmp/instcryptedpasswd
check:rc==0