Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ def datafilelist(installbase, sourcebase):
'src/backend-query/enable-net.sh',
'src/backend-query/list-components.sh',
'src/backend-query/list-rsync-backups.sh',
'src/backend-query/list-tzones.sh',
'src/backend-query/query-langs.sh',
'src/backend-query/send-logs.sh',
'src/backend-query/setup-ssh-keys.sh',
Expand Down
18 changes: 0 additions & 18 deletions src/backend-query/list-tzones.sh

This file was deleted.

6 changes: 6 additions & 0 deletions src/create_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
left = f'{tmp}/left'
partlabel = f'{tmp}/partlabel'
timezone = f'{tmp}/timezone'
utc_clock = f'{tmp}/utc_clock'
KBFile = f'{tmp}/keyboard'
boot_file = f'{tmp}/boot'
disk_scheme = f'{tmp}/scheme'
Expand Down Expand Up @@ -58,6 +59,11 @@ def __init__(self):
f.write('\n# Timezone\n')
f.write(f'timeZone={t_output}\n')
f.write('enableNTP=yes\n')
# Hardware clock, written whether or not a timezone was picked
utc = 'yes'
if os.path.exists(utc_clock):
utc = open(utc_clock, 'r').read().strip() or 'yes'
f.write(f'utcClock={utc}\n')
if os.path.exists(zfs_config):
zfs = True
# Disk Setup
Expand Down
16 changes: 16 additions & 0 deletions src/timezone.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@


time = '%stimezone' % tmp
utc_clock = '%sutc_clock' % tmp
tzdictionary = timezone_dictionary()

cssProvider = Gtk.CssProvider()
Expand Down Expand Up @@ -71,6 +72,10 @@ def save_selection(self):
time_file = open(time, 'w')
time_file.writelines(timezone)
time_file.close()
# no makes pc-sysinstall write /etc/wall_cmos_clock on the install
utc_file = open(utc_clock, 'w')
utc_file.write('yes' if self.utc_check.get_active() else 'no')
utc_file.close()
return
Comment thread
ericbsd marked this conversation as resolved.

def __init__(self, button3):
Expand Down Expand Up @@ -122,6 +127,17 @@ def __init__(self, button3):
sw.add(self.citytreeView)
sw.show()
hbox.pack_start(sw, True, True, 5)

self.utc_check = Gtk.CheckButton.new_with_label(
'Hardware clock uses UTC (uncheck when dual-booting Windows)'
)
self.utc_check.set_active(True)
self.utc_check.set_tooltip_text(
'Windows keeps the hardware clock on local time. '
'Leave this checked on any other machine.'
)
self.utc_check.show()
box2.pack_start(self.utc_check, False, False, 5)
return

def get_model(self):
Expand Down