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

Write timezone correctly.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-08-26 15:05:26 +02:00
parent 3a84c66829
commit f2a087c348
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,16 +88,17 @@ SetTimezoneJob::exec()
.arg( zoneinfoPath ) .arg( zoneinfoPath )
.arg( "/etc/localtime" ) ); .arg( "/etc/localtime" ) );
QFile timezoneFile( "/etc/timezone" ); QFile timezoneFile( gs->value( "rootMountPoint" ).toString() + "/etc/timezone" );
if ( timezoneFile.exists() )
{ if ( !timezoneFile.open( QIODevice::WriteOnly |
if (!timezoneFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) QIODevice::Text |
QIODevice::Truncate ) )
return Calamares::JobResult::error( tr( "Cannot set timezone,"), return Calamares::JobResult::error( tr( "Cannot set timezone,"),
tr( "Cannot open /etc/timezone for writing")); tr( "Cannot open /etc/timezone for writing"));
QTextStream out(&timezoneFile); QTextStream out(&timezoneFile);
out << m_region << '/' << m_zone << "\n"; out << m_region << '/' << m_zone << "\n";
timezoneFile.close(); timezoneFile.close();
}
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }