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

Merge branch '3.1.x-stable' of https://github.com/calamares/calamares into 3.1.x-stable

Browse Source
This commit is contained in:
Philip 2017-12-15 02:52:33 -05:00
commit 5ebd629307
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/modules/hwclock/main.py
View File

@ -5,7 +5,8 @@
# #
# Copyright 2014 - 2015, Philip Müller <philm@manjaro.org> # Copyright 2014 - 2015, Philip Müller <philm@manjaro.org>
# Copyright 2014, Teo Mrnjavac <teo@kde.org> # Copyright 2014, Teo Mrnjavac <teo@kde.org>
# Copyright 2017. Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2017, Gabriel Craciunescu <crazy@frugalware.org>
# #
# Calamares is free software: you can redistribute it and/or modify # Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -20,26 +21,33 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Calamares. If not, see <http://www.gnu.org/licenses/>. # along with Calamares. If not, see <http://www.gnu.org/licenses/>.
import subprocess
import shutil
import libcalamares import libcalamares
def run(): def run():
""" """
Set hardware clock. Set hardware clock.
""" """
hwclock_rtc = ["hwclock", "--systohc", "--utc"]
hwclock_isa = ["hwclock", "--systohc", "--utc", "--directisa"]
is_broken_rtc = False
is_broken_isa = False
root_mount_point = libcalamares.globalstorage.value("rootMountPoint") ret = libcalamares.utils.target_env_call(hwclock_rtc)
try: if ret != 0:
subprocess.check_call(["hwclock", "--systohc", "--utc"]) is_broken_rtc = True
except subprocess.CalledProcessError as e: libcalamares.utils.debug("Hwclock returned error code {}".format(ret))
return ( libcalamares.utils.debug(" .. RTC method failed, trying ISA bus method.")
"Cannot set hardware clock.", else:
"hwclock terminated with exit code {}.".format(e.returncode) libcalamares.utils.debug("Hwclock set using RTC method.")
) if is_broken_rtc:
ret = libcalamares.utils.target_env_call(hwclock_isa)
shutil.copy2("/etc/adjtime", "{!s}/etc/".format(root_mount_point)) if ret != 0:
is_broken_isa = True
libcalamares.utils.debug("Hwclock returned error code {}".format(ret))
libcalamares.utils.debug(" .. ISA bus method failed.")
else:
libcalamares.utils.debug("Hwclock set using ISA bus methode.")
if is_broken_rtc and is_broken_isa:
libcalamares.utils.debug("BIOS or Kernel BUG: Setting hwclock failed.")
return None return None