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

Merge pull request #6924 from gurevichmark/sles15.2_support

Browse Source 
Add support for SLES15 SP2
This commit is contained in:
besawn 2021-03-26 15:03:21 -04:00 committed by GitHub
commit 04a1b2a7cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xCAT-server/lib/perl/xCAT/Template.pm
View File

@ -342,6 +342,9 @@ sub subvars {
$product_dir=$subdir;
if($subdir =~ /^Module-/){
$product_name="sle-".lc($subdir);
}elsif($subdir =~ /^Product-SUSE-Manager-Server|^Product-SLES_SAP|^Product-SLED/){
# Skip product directories that are not "SLES", causes conflict on SLE15.2
next;
}elsif($subdir =~ /^Product-/){
$subdir=~s/Product-//;
$product_name=$subdir;

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

@ -6,3 +6,4 @@ insserv-compat
net-tools-deprecated
rsyslog
nfs-client
wget

31
xCAT-server/share/xcat/netboot/sles/genimage
View File

@ -299,12 +299,20 @@ unless ($onlyinitrd) {
if (-d "$dir/1") {
$ddir .= "/1";
}
system("zypper -R $rootimg_dir $non_interactive ar file:$ddir $osver-$i");
$i++;
if (-d "$dir/2") {
$ddir = $dir . "/2";
if (-d "$ddir/Product-SLES" && -d "$ddir/Module-Basesystem" && -d "$ddir/Module-Legacy") {
# If "Modile" and "Product" directories are there, use them for package repositories
system("zypper -R $rootimg_dir $non_interactive ar file:$ddir/Product-SLES $osver-$i-Product-SLES");
system("zypper -R $rootimg_dir $non_interactive ar file:$ddir/Module-Basesystem $osver-$i-Module-Basesystem");
system("zypper -R $rootimg_dir $non_interactive ar file:$ddir/Module-Legacy $osver-$i-Module-Legacy");
} else {
system("zypper -R $rootimg_dir $non_interactive ar file:$ddir $osver-$i");
$i++;
if (-d "$dir/2") {
$ddir = $dir . "/2";
system("zypper -R $rootimg_dir $non_interactive ar file:$ddir $osver-$i");
$i++;
}
}
}
@ -1998,8 +2006,21 @@ sub generic_post { # This function is meant to leave the image in a state approx
print $cfgfile "NETWORKING=yes\n";
close($cfgfile);
# SLE15 has a symlink to /run/netconfig/resolv.conf and does not need a dummy file
# Check resolv.conf file.
# If it is a link and link leads to an empty file, remove that link
# If it is a link and link leads to a non emply file, leave it alone
# If it is not a link, fill it it with some "dummy" text
if (-l "$rootimg_dir/etc/resolv.conf" ) {
my $link_file = readlink "$rootimg_dir/etc/resolv.conf";
if (-z "$rootimg_dir/$link_file") {
# Link leading to an empty file
# Remove resolv.conf, so that link is gone and code below will
# create a dummy file
unlink("$rootimg_dir/etc/resolv.conf");
}
}
if (! -l "$rootimg_dir/etc/resolv.conf") {
# Not a link, fill in with "dummy" text
open($cfgfile, ">", "$rootimg_dir/etc/resolv.conf");
print $cfgfile "#Dummy resolv.conf to make boot cleaner";
close($cfgfile);