xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 09:36:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6536 from cxhong/dhcp

Browse Source 
Add SLE15 Hierarchy support for ppc64le
This commit is contained in:
Mark Gurevich 2020-01-16 16:47:53 -05:00 committed by GitHub
commit 4ddb82f0d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/lib/xcat/plugins/dhcp.pm
View File

@ -63,7 +63,7 @@ my $checkdomain=0;
# dhcp 4.x will use /etc/dhcp/dhcpd.conf as the config file
my $dhcp6conffile;
if ($^O ne 'aix' and -d "/etc/dhcp") {
if ($^O ne 'aix' and not -e $dhcpconffile and -d "/etc/dhcp") {
$dhcpconffile = '/etc/dhcp/dhcpd.conf';
$dhcp6conffile = '/etc/dhcp/dhcpd6.conf';
}

1
xCAT-server/share/xcat/install/sles/compute.sle15.pkglist
View File

@ -4,3 +4,4 @@ openssl
rsync
insserv-compat
net-tools-deprecated
rsyslog

12
xCAT-server/share/xcat/install/sles/service.sle15.pkglist
View File

@ -1,8 +1,10 @@
@base
@x11
openssl
iputils
ntp
rsync
rsyslog
insserv-compat
net-tools-deprecated
nmap
@ -13,12 +15,10 @@ perl-Expect
perl-SNMP
unixODBC
perl-Net-DNS
perl-DBD-Pg
postgresql-server
perl-DBD-mysql
mariadb-client
libmysqlclient18
# The following rpms are available on the SLES SDK
# You will need to locate and make these rpms available in your zypper
# repository for service node installs and uncomment the following lines:
#MyODBC-unixODBC
#perl-DBD-Pg
#libmysqlclient18
vim

2
xCAT-server/share/xcat/install/sles/service.sle15.ppc64le.otherpkgs.pkglist
View File

@ -1,2 +1,2 @@
xcat/xcat-core/xCATsn
xcat/xcat-dep/sles12/ppc64le/goconserver
xcat/xcat-dep/sles15/ppc64le/goconserver

7
xCAT-server/share/xcat/install/sles/service.sle15.tmpl
View File

@ -43,9 +43,14 @@
</drive>
<!-- XCAT-PARTITION-END -->
</partitioning>
<add-on>
<add_on_products config:type="list">
#INSTALL_SOURCES#
</add_on_products>
</add-on>
<software>
<products config:type="list">
<product>SLES</product>
<product>SLES</product>
</products>
<patterns config:type="list">
#INCLUDE_DEFAULT_PTRNLIST_S#

2
xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist
View File

@ -46,3 +46,5 @@ adaptec-firmware
xz
insserv-compat
net-tools-deprecated
rsyslog
iputils

1
xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist
View File

@ -47,3 +47,4 @@ xz
SLE_HPC-release
insserv-compat
net-tools-deprecated
rsyslog

6
xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist
View File

@ -59,13 +59,15 @@ which
zypper
insserv-compat
net-tools-deprecated
rsyslog
#for database
unixODBC
perl-DBD-mysql
mariadb-client
libmysqlclient18
#libmysqlclient18
# The following rpms are available on the SLES SDK
# You will need to locate and make these rpms available in your zypper
# repository for service node installs and uncomment the following lines:
#MyODBC-unixODBC
#perl-DBD-Pg
perl-DBD-Pg
iputils

2
xCAT/postscripts/otherpkgs
View File

@ -343,7 +343,7 @@ fi
# (4) for other os, we just keep it here.
# For other pkg paths, we just keep it here.
if [ $dir == $default_pkgdir ] || [ $dir == "$default_pkgdir/" ]; then
if ( pmatch "$OSVER" "sles*" ); then
if ( pmatch "$OSVER" "sle*" ); then
OSPKGDIR="$OSPKGDIR/1"
ospkgdir="$ospkgdir/1"
elif ( pmatch "$OSVER" "SL5*" ); then

2
xCAT/postscripts/syslog
View File

@ -329,7 +329,7 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
fi
else
if ( pmatch $OSVER "sles*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ]; then
if ( pmatch $OSVER "sle*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ]; then
#find out which syslog is used for SLES, syslog or syslog-ng
result=`grep "^SYSLOG_DAEMON=" $sysconfig 2>&1`
if ( pmatch $result "*syslog-ng*" ); then