From 18218b250ec2c3fd28693ae400703191c81fa98a Mon Sep 17 00:00:00 2001 From: Rohan Garg Date: Fri, 7 Aug 2015 17:32:02 +0200 Subject: [PATCH] Adjust /etc/timezone if it exists --- src/modules/locale/SetTimezoneJob.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/modules/locale/SetTimezoneJob.cpp b/src/modules/locale/SetTimezoneJob.cpp index 485e6a96d..c09abcb8c 100644 --- a/src/modules/locale/SetTimezoneJob.cpp +++ b/src/modules/locale/SetTimezoneJob.cpp @@ -82,5 +82,16 @@ SetTimezoneJob::exec() .arg( zoneinfoPath ) .arg( "/etc/localtime" ) ); + QFile timezoneFile( "/etc/timezone" ); + if ( timezoneFile.exists() ) + { + if (!timezoneFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) + return Calamares::JobResult::error( tr( "Cannot set timezone,"), + tr( "Cannot open /etc/timezone for writing")); + + QTextStream out(&timezoneFile); + out << m_region << '/' << m_zone << "\n"; + timezoneFile.close(); + } return Calamares::JobResult::ok(); }