xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 01:56:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6537 from cxhong/otherpkgs

Browse Source 
Support otherpkgs as postbootscript for SLE15
This commit is contained in:
besawn 2020-01-17 08:40:18 -05:00 committed by GitHub
commit b366a1d589
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/share/xcat/install/scripts/post.xcat
View File

@ -282,7 +282,7 @@ if [ $? -eq 0 ]; then
fi
if [ $hassystemd -eq 1 ] ; then
if [[ $OSVER == sles12* ]]; then
if [[ $OSVER =~ sle && $OSVER != sles11* ]]; then
cat >/etc/systemd/system/xcatpostinit1.service <<'EOF'
#INCLUDE:/install/postscripts/xcatpostinit1.service.yast2#
EOF
@ -514,7 +514,7 @@ cd /
# To skip the conflict, the network service should be stoped in the yast first stage. Then base on the service
# dependency, the service start order will be 'YaST2-Second-Stage.service'->'network'->'xcatpostinit1' in serial.
# Then the Yast2 will be stopped before running the zypper in otherpkgs.
if [[ $OSVER =~ sles && $OSVER != sles11* ]]; then
if [[ $OSVER =~ sle && $OSVER != sles11* ]]; then
service network stop
fi

4
xCAT/postscripts/enablekdump
View File

@ -40,7 +40,7 @@ for i in `/bin/cat /proc/cmdline`; do
done
if [ ! -z "$MACX" ] && [ ! -z "$ETHX" ]; then
if (pmatch $OSVER "sles*") || (pmatch $OSVER "suse*") || [ -f /etc/SuSE-release ]; then
if (pmatch $OSVER "sle*") || (pmatch $OSVER "suse*") || [ -f /etc/SuSE-release ]; then
CONFFILE=$MNTDIR/etc/sysconfig/network/ifcfg-$ETHX
fi
if (pmatch $OSVER "fedora*") || (pmatch $OSVER "rhel6*") || (pmatch $OSVER "rhels6*") || [ -f /etc/fedora-release ] || [ -f /etc/redhat-release ];then
@ -108,7 +108,7 @@ if [ ! -z "$DUMP" ]; then
fi
if [ "$KDPROTO" = "nfs" ]; then
if (pmatch $OSVER "sles*") || (pmatch $OSVER "suse*") || [ -f /etc/SuSE-release ]; then
if (pmatch $OSVER "sle*") || (pmatch $OSVER "suse*") || [ -f /etc/SuSE-release ]; then
if (pmatch $OSVER "*10*"); then
#run mkinitrd to generater the kdump-init base
if (pmatch $ARCH "x86*"); then

4
xCAT/postscripts/setupntp.traditional
View File

@ -94,7 +94,7 @@ if [ $OS_TYPE = Linux ]; then
mkdir -p /var/lib/ntp
chown ntp /var/lib/ntp
if ( pmatch $OSVER "sles*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ];then
if ( pmatch $OSVER "sle*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ];then
echo "driftfile /var/lib/ntp/drift/ntp.drift" >>$conf_file
else
echo "driftfile /var/lib/ntp/drift" >>$conf_file
@ -135,7 +135,7 @@ if [ $OS_TYPE = Linux ]; then
hwclock --systohc --utc
#setup the RTC is UTC format, which will be used by os
if ( pmatch $OSVER "sles*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ];then
if ( pmatch $OSVER "sle*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ];then
grep -i -q "HWCLOCK" /etc/sysconfig/clock
if [ $? -eq 0 ];then
sed -i 's/.*HWCLOCK.*/HWCLOCK=\"-u\"/' /etc/sysconfig/clock