napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use timedatectl provided by systemd to set the time on the target

Browse Source 
Use tools provided by systemd to set the time and fall back to
manually doing it via linking /etc/localtime
This commit is contained in:
Rohan Garg 2015-08-07 15:38:31 +02:00 committed by Teo Mrnjavac
parent 7212aaec74
commit a98742c32c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/locale/SetTimezoneJob.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
* Copyright 2015, Rohan Garg <rohan@garg.io>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -45,6 +46,14 @@ SetTimezoneJob::prettyName() const
Calamares::JobResult
SetTimezoneJob::exec()
{
int ec = CalamaresUtils::System::instance()->
targetEnvCall( { "timedatectl",
"set-timezone",
m_region + '/' + m_zone } );
if ( !ec )
return Calamares::JobResult::ok();
QString localtimeSlink( "/etc/localtime" );
QString zoneinfoPath( "/usr/share/zoneinfo" );
zoneinfoPath.append( QDir::separator() + m_region );
@ -62,7 +71,7 @@ SetTimezoneJob::exec()
"-f",
localtimeSlink } );
int ec = CalamaresUtils::System::instance()->
ec = CalamaresUtils::System::instance()->
targetEnvCall( { "ln",
"-s",
zoneinfoPath,