Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

utils: assume Fedora 18+ in dom0

Browse Source
This commit is contained in:
Rusty Bird 2021-02-15 14:10:42 +00:00
parent 7860c3b365
commit 7a43ee6ae2
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubes/utils.py
View File

@ -27,7 +27,6 @@ import random
import string import string
import os import os
import os.path import os.path
import re
import socket import socket
import subprocess import subprocess
import tempfile import tempfile
@ -44,20 +43,9 @@ LOGGER = logging.getLogger('qubes.utils')
def get_timezone(): def get_timezone():
# fc18
if os.path.islink('/etc/localtime'): if os.path.islink('/etc/localtime'):
tz_path = '/'.join(os.readlink('/etc/localtime').split('/')) tz_path = '/'.join(os.readlink('/etc/localtime').split('/'))
return tz_path.split('zoneinfo/')[1] return tz_path.split('zoneinfo/')[1]
# <=fc17
if os.path.exists('/etc/sysconfig/clock'):
clock_config = open('/etc/sysconfig/clock', "r")
clock_config_lines = clock_config.readlines()
clock_config.close()
zone_re = re.compile(r'^ZONE="(.*)"')
for line in clock_config_lines:
line_match = zone_re.match(line)
if line_match:
return line_match.group(1)
# last resort way, some applications makes /etc/localtime # last resort way, some applications makes /etc/localtime
# hardlink instead of symlink... # hardlink instead of symlink...
tz_info = os.stat('/etc/localtime') tz_info = os.stat('/etc/localtime')