xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 11:22:27 +00:00
Code Issues Releases Wiki Activity

fix defect #4743 [fvt]2.10:after diskless provision could not log in compute node without passord

Browse Source
This commit is contained in:
immarvin
2015-07-13 04:39:12 -04:00
parent fcf732c960
commit dcbc16a5ab
4 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xCAT-server/lib/xcat/plugins/debian.pm
View File

@@ -1401,6 +1401,21 @@ sub mknetboot
if(($nodestatus eq "n") or ($nodestatus eq "N") or ($nodestatus eq "0")){
$kcmdline .= " nonodestatus ";
}
if($::XCATSITEVALS{xcatdebugmode} eq "1"){
my ($host, $ipaddr) = xCAT::NetworkUtils->gethostnameandip($xcatmaster);
if($ipaddr){
$kcmdline .=" LOGSERVER=$ipaddr ";
}else{
$kcmdline .=" LOGSERVER=$xcatmaster ";
}
$kcmdline .= " xcatdebugmode=1 ";
}
# add one parameter: ifname=<eth0>:<mac address>
# which is used for dracut
# the redhat5.x os will ignore it

14
xCAT-server/lib/xcat/plugins/sles.pm
View File

@@ -576,6 +576,20 @@ sub mknetboot
$kcmdline .= " nonodestatus ";
}
if($::XCATSITEVALS{xcatdebugmode} eq "1"){
my ($host, $ipaddr) = xCAT::NetworkUtils->gethostnameandip($xcatmaster);
if($ipaddr){
$kcmdline .=" LOGSERVER=$ipaddr ";
}else{
$kcmdline .=" LOGSERVER=$xcatmaster ";
}
$kcmdline .= " xcatdebugmode=1 ";
}
$kcmdline .= "NODE=$node ";
# add flow control setting
$kcmdline .= "FC=$useflowcontrol ";

2
xCAT-server/share/xcat/install/scripts/scriptlib
View File

@@ -8,7 +8,7 @@ declare -F msgutil_r &>/dev/null || function msgutil_r {
msgtype="debug"
fi
if [ -n "logserver" ];then
if [ -n "$logserver" ];then
logger -n $logserver -t xcat -p local4.$msgtype "$msgstr"
if [ "$?" != "0" ];then
exec 3<>/dev/udp/$logserver/514 >/dev/null 2>&1;logger -s -t xcat -p local4.$msgtype "$msgstr" 1>&3 2>&1

2
xCAT/postscripts/xcatlib.sh
View File

@@ -715,7 +715,7 @@ function msgutil_r {
fi
if [ -n "logserver" ];then
if [ -n "$logserver" ];then
logger -n $logserver -t xcat -p local4.$msgtype "$msgstr" >/dev/null 2>&1
if [ "$?" != "0" ];then
exec 3<>/dev/udp/$logserver/514 >/dev/null 2>&1;logger -s -t xcat -p local4.$msgtype "$msgstr" 1>&3 2>&1