diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2026-01-13 17:16:49 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2026-01-13 18:20:23 +0000 |
| commit | 9a66062be6806d10e79365da408993f8dca565df (patch) | |
| tree | ffd3966e21e05703fb21885bf1aca649b32d685a /perl-install | |
| parent | 91a61d86efdbc41a5c1cde1fc3c84a3ed495ed54 (diff) | |
| download | drakx-9a66062be6806d10e79365da408993f8dca565df.tar drakx-9a66062be6806d10e79365da408993f8dca565df.tar.gz drakx-9a66062be6806d10e79365da408993f8dca565df.tar.bz2 drakx-9a66062be6806d10e79365da408993f8dca565df.tar.xz drakx-9a66062be6806d10e79365da408993f8dca565df.zip | |
installer: add timezone data files to the installer root filesystem
This allows us to adjust the system clock before we have created the
target root filesystem. Needed by the following commit.
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/share/list.xml | 4 | ||||
| -rw-r--r-- | perl-install/timezone.pm | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 3c1100d34..b946f95db 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -241,6 +241,10 @@ </from> <from dir="/usr/share/zoneinfo"> + <from expand="glob"> + [A-Z]* + [A-Z]*/* + </from> zone.tab </from> diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm index fb4be35d3..faf769054 100644 --- a/perl-install/timezone.pm +++ b/perl-install/timezone.pm @@ -7,10 +7,7 @@ use common; use log; sub get_timezone_prefix { - my ($b_use_system_prefix) = @_; - - my $prefix = ($::testing || $b_use_system_prefix) ? '' : $::prefix; - $prefix . "/usr/share/zoneinfo"; + '/usr/share/zoneinfo'; } sub getTimeZones() { @@ -54,7 +51,7 @@ sub write { set_ntp_pool($t->{ntp}); - my $tz_prefix = get_timezone_prefix(1); + my $tz_prefix = get_timezone_prefix(); eval { symlinkf($tz_prefix . '/' . $t->{timezone}, "$::prefix/etc/localtime") }; $@ and log::l("installing /etc/localtime failed"); setVarsInSh("$::prefix/etc/sysconfig/clock", { |