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

A timezone is a file, not a directory.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-08-04 21:47:44 +02:00
parent 9ce55bfb83
commit 1d6c41e94d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@
#include "utils/CalamaresUtilsSystem.h" #include "utils/CalamaresUtilsSystem.h"
#include <QDir> #include <QDir>
#include <QFileInfo>
SetTimezoneJob::SetTimezoneJob( const QString& region, const QString& zone ) SetTimezoneJob::SetTimezoneJob( const QString& region, const QString& zone )
@ -49,10 +50,10 @@ SetTimezoneJob::exec()
zoneinfoPath.append( QDir::separator() + m_zone ); zoneinfoPath.append( QDir::separator() + m_zone );
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
QDir zoneDir( gs->value( "rootMountPoint" ).toString() + zoneinfoPath ); QFileInfo zoneFile( gs->value( "rootMountPoint" ).toString() + zoneinfoPath );
if ( !zoneDir.exists() || !zoneDir.isReadable() ) if ( !zoneFile.exists() || !zoneFile.isReadable() )
return Calamares::JobResult::error( tr( "Cannot access timezone directory." ), return Calamares::JobResult::error( tr( "Cannot access selected timezone path." ),
tr( "Bad path: %1" ).arg( zoneDir.absolutePath() ) ); tr( "Bad path: %1" ).arg( zoneFile.absolutePath() ) );
int ec = CalamaresUtils::chrootCall( { "ln", int ec = CalamaresUtils::chrootCall( { "ln",
"-s", "-s",