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

Merge pull request #6540 from Obihoernchen/sle15-lenovo

Browse Source 
SLE15: Merge some stuff from Lenovo branch
This commit is contained in:
cxhong 2020-01-22 13:11:52 -05:00 committed by GitHub
commit 178b6b7bba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1753,10 +1753,22 @@ sub copycd
}
if ($dsc =~ /Installer/ and $dsc =~ /SLE-15/) {
$discnumber = 1;
unless ($distname) { $distname = "sle15" };
unless ($distname) {
if ($dsc =~ /SLE-15-SP(\d)/) {
$distname = "sle15.$1";
} else {
$distname = "sle15";
}
};
} elsif ($dsc =~ /SLE-15/ and $dsc =~ /Packages/) {
$discnumber = 2;
unless ($distname) { $distname = "sle15" };
unless ($distname) {
if ($dsc =~ /SLE-15-SP(\d)/) {
$distname = "sle15.$1";
} else {
$distname = "sle15";
}
};
}
}

2
xCAT-server/share/xcat/install/sles/compute.sle15.tmpl
View File

@ -12,7 +12,7 @@
</bootloader>
<general>
<clock>
<hwclock>GMT</hwclock>
<hwclock>UTC</hwclock>
<timezone>#TABLE:site:key=timezone:value#</timezone>
</clock>
<keyboard>

2
xCAT-server/share/xcat/install/sles/compute.sles12.tmpl
View File

@ -12,7 +12,7 @@
</bootloader>
<general>
<clock>
<hwclock>GMT</hwclock>
<hwclock>UTC</hwclock>
<timezone>#TABLE:site:key=timezone:value#</timezone>
</clock>
<keyboard>

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

@ -12,7 +12,7 @@
</bootloader>
<general>
<clock>
<hwclock>GMT</hwclock>
<hwclock>UTC</hwclock>
<timezone>#TABLE:site:key=timezone:value#</timezone>
</clock>
<keyboard>

2
xCAT-server/share/xcat/install/sles/service.sles12.tmpl
View File

@ -12,7 +12,7 @@
</bootloader>
<general>
<clock>
<hwclock>GMT</hwclock>
<hwclock>UTC</hwclock>
<timezone>#TABLE:site:key=timezone:value#</timezone>
</clock>
<keyboard>