2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-04 17:28:18 +00:00

Merge pull request #6192 from xcat2/master

Merge master to 2.14 for 2.14.6 release(2)
This commit is contained in:
zet809
2019-03-28 17:48:36 +08:00
committed by GitHub
15 changed files with 50 additions and 48 deletions

View File

@@ -57,11 +57,11 @@ The kdump will create a new initrd which used in the dumping stage. The ``/tmp``
* **[RHELS]** ::
tmpfs /var/tmp tmpfs defaults,size=200m 0 2
tmpfs /var/tmp tmpfs defaults,size=500m 0 2
* **[SLES11]** ::
tmpfs /tmp tmpfs defaults,size=200m 0 2
tmpfs /tmp tmpfs defaults,size=500m 0 2
* **[Ubuntu]** ::

View File

@@ -103,9 +103,6 @@ lsxcatd_a
lsxcatd_d
lsxcatd_h
lsxcatd_null
makeconservercf_d
makeconservercf_noderange
makeconservercf_null
makedhcp_a
makedhcp_a_d
makedhcp_d

View File

@@ -117,9 +117,6 @@ lsxcatd_a
lsxcatd_d
lsxcatd_h
lsxcatd_null
makeconservercf_d
makeconservercf_noderange
makeconservercf_null
makedhcp_a
makedhcp_a_d
makedhcp_d

View File

@@ -117,9 +117,6 @@ lsxcatd_a
lsxcatd_d
lsxcatd_h
lsxcatd_null
makeconservercf_d
makeconservercf_noderange
makeconservercf_null
makedhcp_a
makedhcp_a_d
makedhcp_d

View File

@@ -83,9 +83,6 @@ lsxcatd_a
lsxcatd_d
lsxcatd_h
lsxcatd_null
makeconservercf_d
makeconservercf_noderange
makeconservercf_null
makedhcp_a
makedhcp_a_d
makedhcp_d

View File

@@ -83,9 +83,6 @@ lsxcatd_a
lsxcatd_d
lsxcatd_h
lsxcatd_null
makeconservercf_d
makeconservercf_noderange
makeconservercf_null
makedhcp_a
makedhcp_a_d
makedhcp_d

View File

@@ -83,9 +83,6 @@ lsxcatd_a
lsxcatd_d
lsxcatd_h
lsxcatd_null
makeconservercf_d
makeconservercf_noderange
makeconservercf_null
makedhcp_a
makedhcp_a_d
makedhcp_d

View File

@@ -55,9 +55,6 @@ lsxcatd_a
lsxcatd_d
lsxcatd_h
lsxcatd_null
makeconservercf_d
makeconservercf_noderange
makeconservercf_null
makedhcp_a_ubuntu
makedhcp_d
makedhcp_n

View File

@@ -55,9 +55,6 @@ lsxcatd_a
lsxcatd_d
lsxcatd_h
lsxcatd_null
makeconservercf_d
makeconservercf_noderange
makeconservercf_null
makedhcp_a_ubuntu
makedhcp_d
makedhcp_n

View File

@@ -1,5 +1,5 @@
start:makeconservercf_null
label:others,ci_test
label:others,conserver
cmd:chdef -t node -o testnodetmp cons=hmc groups=all
cmd:service goconserver stop
cmd:#!/bin/bash
@@ -26,11 +26,12 @@ else
exit $?
fi
check:rc==0
cmd:service conserver stop
cmd:rmdef -t node testnodetmp
end
start:makeconservercf_noderange
label:others,ci_test
label:others,conserver
cmd:chdef -t node -o testnodetmp cons=hmc groups=all
cmd:service goconserver stop
cmd:#!/bin/bash
@@ -68,10 +69,11 @@ else
fi
check:rc==0
cmd:rmdef -t node testnodetmp
cmd:service conserver stop
end
start:makeconservercf_d
label:others,ci_test
label:others,conserver
cmd:chdef -t node -o testnodetmp cons=hmc groups=all
cmd:service goconserver stop
cmd:#!/bin/bash
@@ -115,6 +117,7 @@ fi
check:rc==0
cmd:cat /etc/conserver.cf | grep testnodetmp
check:output!~testnodetmp
cmd:service conserver stop
cmd:rmdef -t node testnodetmp
end

View File

@@ -60,6 +60,8 @@ os:Linux
description:test packimage -m cpio -c gzip
label:others,packaging,invoke_provision
cmd:copycds $$ISO
cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi
check:rc==0
cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi
cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz /rootimg.cpio.gz.bak;fi
cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
@@ -89,6 +91,7 @@ check:rc==0
check:output=~on / type tmpfs
cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi
check:rc==0
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz
cmd:mv -f /rootimg.cpio.gz.bak /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz
cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg
@@ -100,6 +103,8 @@ os:Linux
description:test packimage -m cpio -c pigz
label:others,packaging,invoke_provision
#cmd:copycds $$ISO
cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi
check:rc==0
cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi
cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz /rootimg.cpio.gz.bak;fi
cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
@@ -133,6 +138,7 @@ check:rc==0
check:output=~on / type tmpfs
cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi
check:rc==0
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz
cmd:mv -f /rootimg.cpio.gz.bak /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz
cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg
@@ -144,6 +150,8 @@ os:Linux
description:test packimage -m cpio -c xz
label:others,packaging,invoke_provision
#cmd:copycds $$ISO
cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi
check:rc==0
cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi
cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.xz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.xz /rootimg.cpio.xz.bak;fi
cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
@@ -173,6 +181,7 @@ check:rc==0
check:output=~on / type tmpfs
cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi
check:rc==0
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.xz
cmd:mv -f /rootimg.cpio.xz.bak /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.xz
cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg
@@ -184,6 +193,8 @@ os:Linux
description:test packimage -m tar -c pigz
label:others,packaging,invoke_provision
#cmd:copycds $$ISO
cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi
check:rc==0
cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi
cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz /rootimg.tar.gz.bak;fi
cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
@@ -228,6 +239,7 @@ cmd:xdsh $$CN "userdel xcatuser"
check:rc==0
cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi
check:rc==0
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz
cmd:mv -f /rootimg.tar.gz.bak /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz
cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg
@@ -239,6 +251,8 @@ os:Linux
description:test packimage -m tar -c gzip
label:others,packaging,invoke_provision
#cmd:copycds $$ISO
cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi
check:rc==0
cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi
cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz /rootimg.tar.gz.bak;fi
cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
@@ -279,6 +293,7 @@ cmd:xdsh $$CN "userdel xcatuser"
check:rc==0
cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi
check:rc==0
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz
cmd:mv -f /rootimg.tar.gz.bak /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz
cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg
@@ -290,6 +305,8 @@ os:Linux
description:test packimage -m tar -c xz
label:others,packaging,invoke_provision
#cmd:copycds $$ISO
cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi
check:rc==0
cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi
cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.xz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.xz /rootimg.tar.xz.bak;fi
cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
@@ -330,6 +347,7 @@ cmd:xdsh $$CN "userdel xcatuser"
check:rc==0
cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi
check:rc==0
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.xz
cmd:mv -f /rootimg.tar.xz.bak /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.xz
cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg

View File

@@ -29,10 +29,8 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=
check:rc==0
cmd:makedns -n
check:rc==0
cmd:makeconservercf $$CN
cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi
check:rc==0
cmd:cat /etc/conserver.cf | grep $$CN
check:output=~$$CN
cmd:sleep 20
cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64" ]]; then getmacs -D $$CN; fi
check:rc==0
@@ -70,6 +68,7 @@ cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,ar
check:rc==0
cmd:oldcryptmethod=`cat /tmp/tmpcryptmethod |sed 's/\"//g'`;chtab key=system passwd.cryptmethod=$oldcryptmethod
check:rc==0
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
cmd:rm -rf /tmp/tmpcryptmethod /tmp/shadow
end
@@ -104,10 +103,8 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=
check:rc==0
cmd:makedns -n
check:rc==0
cmd:makeconservercf $$CN
cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi
check:rc==0
cmd:cat /etc/conserver.cf | grep $$CN
check:output=~$$CN
cmd:sleep 20
cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64" ]]; then getmacs -D $$CN; fi
check:rc==0
@@ -145,6 +142,7 @@ cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,ar
check:rc==0
cmd:oldcryptmethod=`cat /tmp/tmpcryptmethod |sed 's/\"//g'`;chtab key=system passwd.cryptmethod=$oldcryptmethod
check:rc==0
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
cmd:rm -rf /tmp/tmpcryptmethod /tmp/shadow
end
@@ -179,10 +177,8 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=
check:rc==0
cmd:makedns -n
check:rc==0
cmd:makeconservercf $$CN
cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi
check:rc==0
cmd:cat /etc/conserver.cf | grep $$CN
check:output=~$$CN
cmd:sleep 20
cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64" ]]; then getmacs -D $$CN; fi
check:rc==0
@@ -220,6 +216,7 @@ cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,ar
check:rc==0
cmd:oldcryptmethod=`cat /tmp/tmpcryptmethod |sed 's/\"//g'`;chtab key=system passwd.cryptmethod=$oldcryptmethod
check:rc==0
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
cmd:rm -rf /tmp/tmpcryptmethod /tmp/shadow
end
@@ -266,10 +263,8 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=
check:rc==0
cmd:makedns -n
check:rc==0
cmd:makeconservercf $$CN
cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi
check:rc==0
cmd:cat /etc/conserver.cf | grep $$CN
check:output=~$$CN
cmd:sleep 20
cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64" ]]; then getmacs -D $$CN; fi
check:rc==0
@@ -307,5 +302,6 @@ cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,ar
check:rc==0
cmd:oldpassword=`cat /tmp/tmppassword |sed 's/\"//g'`;oldcryptmethod=`cat /tmp/tmpcryptmethod |sed 's/\"//g'`;chtab key=system passwd.password=$oldpassword passwd.cryptmethod=$oldcryptmethod
check:rc==0
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
cmd:rm -rf /tmp/tmpcryptmethod /tmp/tmppassword /tmp/shadow
end

View File

@@ -5,9 +5,12 @@ cmd:runcmdinstaller -h
check:rc==0
check:output=~runcmdinstaller <node> <commands>
end
start:runcmdinstaller_command
description:runcmdinstaller
label:others,postscripts
cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi
check:rc==0
cmd:chtab key=xcatdebugmode site.value="2"
check:rc==0
cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
@@ -19,10 +22,14 @@ cmd:runcmdinstaller $$CN "ls /"
check:rc==0
check:output=~tmp
cmd:chtab key=xcatdebugmode site.value="0"
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
end
start:get_xcat_postscripts_loginfo
description:get xcat post scripts loginfo
label:others,postscripts
cmd:if [ -x /usr/bin/goconserver ]; then makegocons $$CN; else makeconservercf $$CN; fi
check:rc==0
cmd:chtab key=xcatdebugmode site.value="1"
check:rc==0
cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
@@ -34,7 +41,9 @@ cmd:rc==0
cmd:cat /var/log/messages /var/log/xcat/computes.log 2>/dev/null | grep "program: ++"
cmd:rc==0
cmd:chtab key=xcatdebugmode site.value="0"
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
end
start:updatenode_postscripts_loginfo
description:get updatenode postsripts log info
label:others,postscripts

View File

@@ -693,10 +693,10 @@ elif [ "$1" = "-s" ];then
fi
if [ $networkmanager_active -eq 1 ]; then
nmcli con up $con_name
wait_for_ifstate $str_inst_nic UP 10 5
else
ifup $str_inst_nic
fi
wait_for_ifstate $str_inst_nic UP 20 5
fi
if [ $? -ne 0 ]; then
log_error "bring $str_inst_nic up failed."
@@ -1109,10 +1109,10 @@ else
echo "bring up ip"
if [ $networkmanager_active -eq 1 ]; then
nmcli con up $con_name
wait_for_ifstate $str_nic_name UP 10 10
else
ifup $str_nic_name
fi
wait_for_ifstate $str_nic_name UP 20 5
if [ $? -ne 0 ]; then
log_error "bring $str_nic_name up failed."
error_code=1

View File

@@ -246,10 +246,8 @@ EOF
echo "nfs $KDIP:$KDPATH" > /etc/kdump.conf
echo "default shell" >> /etc/kdump.conf
if (pmatch $OSVER "rhel7*") || (pmatch $OSVER "rhels7*");then
#strip "xcat" out of the initramfs for kdump
echo "dracut_args --omit \"xcat\"" >> /etc/kdump.conf
fi
#strip "xcat" out of the initramfs for kdump
echo "dracut_args --omit \"xcat\"" >> /etc/kdump.conf
#strip the unnecessary kernel options from /proc/cmdline
#the modified "cmdline" will be used as the kernel options
#for kdump initramfs; otherwise, the "service kdump restart" will fail
@@ -262,7 +260,9 @@ EOF
fi
done
sed -i "s#^[\t ]*KDUMP_COMMANDLINE=\"#KDUMP_COMMANDLINE=\"$kdumpcmdline#" /etc/sysconfig/kdump
sed -i "s#^[\t ]*KDUMP_COMMANDLINE_APPEND=\"#KDUMP_COMMANDLINE_APPEND=\"root=nfs:$KDIP:$KDPATH #" /etc/sysconfig/kdump
if (pmatch $OSVER "rhel7*") || (pmatch $OSVER "rhels7*"); then
sed -i "s#^[\t ]*KDUMP_COMMANDLINE_APPEND=\"#KDUMP_COMMANDLINE_APPEND=\"root=nfs:$KDIP:$KDPATH #" /etc/sysconfig/kdump
fi
[ -f /etc/dracut.conf ] && mv /etc/dracut.conf /tmp/dracut.conf
restartservice kdump
[ -f /tmp/dracut.conf ] && mv /tmp/dracut.conf /etc/dracut.conf