xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-03 03:50:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7077 from besawn/packimage_timezone_fix

Browse Source 
Improve packimage time zone handling
This commit is contained in:
besawn 2022-02-01 08:18:24 -05:00 committed by GitHub
commit 346b38c55a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
xCAT-server/lib/xcat/plugins/packimage.pm
View File

@ -75,6 +75,7 @@ sub process_request {
my $callback = shift;
my $doreq = shift;
my $installroot = xCAT::TableUtils->getInstallDir();
my @timezone = xCAT::TableUtils->get_site_attribute("timezone");
my $args;
if (defined($request->{arg})) {
@ -343,6 +344,30 @@ sub process_request {
}
close($exlist);
# timedatectl requires /etc/localtime link to the zoneinfo in /usr/share/zoneinfo
if ($timezone[0]) {
unlink("$rootimg_dir/etc/localtime");
symlink("../usr/share/zoneinfo/$timezone[0]", "$rootimg_dir/etc/localtime");
# Add the zoneinfo to the include list
$excludetext .= "+./usr/share/zoneinfo/$timezone[0]\n";
# /usr/share/zoneinfo can have many levels of links
# If the configured timezone is a link, also add the link target to the include list
# Note: this logic can only handle 2 levels of linking
my $realtimezonefile = Cwd::abs_path("$rootimg_dir/usr/share/zoneinfo/$timezone[0]");
if ("$rootimg_dir/usr/share/zoneinfo/$timezone[0]" ne "$realtimezonefile") {
my $relativetzpath = substr($realtimezonefile, length($rootimg_dir));
$excludetext .= "+.$relativetzpath\n";
}
if (not stat "$rootimg_dir/etc/localtime") {
$callback->({ warning => ["Unable to set timezone to \'$timezone[0]\', check this is a valid timezone"] });
}
} else {
$callback->({ info => ["No timezone defined in site table, skipping timezone configuration"] });
}
#handle the #INLCUDE# tag recursively
my $idir = dirname($exlistlocname);
my $doneincludes = 0;
@ -645,7 +670,6 @@ sub copybootscript {
my $arch = shift;
my $profile = shift;
my $callback = shift;
my @timezone = xCAT::TableUtils->get_site_attribute("timezone");
if (-f "$installroot/postscripts/xcatdsklspost") {
@ -653,15 +677,6 @@ sub copybootscript {
mkpath("$rootimg_dir/opt/xcat");
copy("$installroot/postscripts/xcatdsklspost", "$rootimg_dir/opt/xcat/xcatdsklspost");
if ($timezone[0]) {
unlink("$rootimg_dir/etc/localtime");
# Copy timezone file to /etc and link 'localtime' to it
mkpath(dirname("$rootimg_dir/etc/$timezone[0]"));
copy("$rootimg_dir/usr/share/zoneinfo/$timezone[0]", "$rootimg_dir/etc/$timezone[0]");
symlink("./$timezone[0]", "$rootimg_dir/etc/localtime");
}
chmod(0755, "$rootimg_dir/opt/xcat/xcatdsklspost");
} else {