Добавлена возможность настройки типа аппаратных часов (локальное время или UTC)

pym/install/variables/locale.py

@@ -352,11 +352,13 @@ class VariableOsInstallClockType(Variable):
     """
     mode = 'w'
     type = 'choice'
-    opt = ["--clocktype"]
-    metavalue = "CLOCKTYPE"
+    opt = ["--hwclock"]
+    metavalue = "CLOCK"
+    fallback_value = "local"
 
     def init(self):
-        self.label = _("Clock type")
+        self.label = _("Hardware clock type")
+        self.help = _("set hardware clock type")
 
     def get(self):
         """type of clock (UTC or local)"""
@@ -368,7 +370,7 @@ class VariableOsInstallClockType(Variable):
                     return clock.upper()
                 elif clock.lower() == 'local':
                     return clock.lower()
-        return "local"
+        return self.fallback_value
 
     def choice(self):
         return ["local", "UTC"]

pym/install/wsdl_install.py

@@ -68,7 +68,8 @@ class Wsdl(WsdlBase):
                                 image="welcome",
                                 normal=('os_install_locale_lang',
                                         'os_install_clock_timezone'),
-                                expert=('os_install_locale_keyboard_layout',)),
+                                expert=('os_install_locale_keyboard_layout',
+                                        'os_install_clock_type',)),
             lambda group: group(_("Distribution"),
                                 normal=('cl_image_filename',),
                                 hide=('cl_image_linux_shortname',
@@ -357,6 +358,7 @@ class Wsdl(WsdlBase):
                                             'os_install_clock_timezone'),
                                     expert=(
                                         'os_install_locale_keyboard_layout',
+                                        'os_install_clock_type',
                                         'cl_templates_locate',
                                         'cl_dispatch_conf',
                                         'cl_verbose_set'),