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

Fix handling /etc/localtime hardlink

Browse Source 
If /etc/localtime in dom0 is a hardlink to zoneinfo file (instead of
symlink) and more than one zoneinfo file is hardlinked to this inode,
appVMs will get invalid timezone, e.g. "Europe/Warsaw\x0aPoland".

Reported by @yaqu, fix provided by @yaqu
Fixes QubesOS/qubes-issues#1315
This commit is contained in:
Marek Marczykowski-Górecki 2015-10-10 17:30:40 +02:00
parent 18edf4946c
commit 350e279f4f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core-modules/000QubesVm.py
View File

@ -1008,8 +1008,9 @@ class QubesVm(object):
return None return None
if tz_info.st_nlink > 1: if tz_info.st_nlink > 1:
p = subprocess.Popen(['find', '/usr/share/zoneinfo', p = subprocess.Popen(['find', '/usr/share/zoneinfo',
'-inum', str(tz_info.st_ino)], '-inum', str(tz_info.st_ino),
stdout=subprocess.PIPE) '-print', '-quit'],
stdout=subprocess.PIPE)
tz_path = p.communicate()[0].strip() tz_path = p.communicate()[0].strip()
return tz_path.replace('/usr/share/zoneinfo/', '') return tz_path.replace('/usr/share/zoneinfo/', '')
return None return None