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

Revert "qubes/vm/qubesvm: remove prefixes from qubesdb keys"

Browse Source 
There is no point in changing *public API* for just a change without any
better reason. It turned out most of those settings will be the same in
Qubes 4.0, so keep names the same.

This reverts commit 2d6ad3b60c.

QubesOS/qubes-issues#1812
This commit is contained in:
Marek Marczykowski-Górecki 2016-09-07 03:05:49 +02:00
parent f6bc61997a
commit d5a41e838f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qubes/vm/qubesvm.py
View File

@ -1456,16 +1456,17 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
# pylint: disable=no-member
self.qdb.write('/name', self.name)
self.qdb.write('/type', self.__class__.__name__)
self.qdb.write('/updateable', str(self.updateable))
self.qdb.write('/persistence', 'full' if self.updateable else 'rw-only')
self.qdb.write('/debug', str(int(self.debug)))
self.qdb.write('/qubes-vm-type', self.__class__.__name__)
self.qdb.write('/qubes-vm-updateable', str(self.updateable))
self.qdb.write('/qubes-vm-persistence',
'full' if self.updateable else 'rw-only')
self.qdb.write('/qubes-debug-mode', str(int(self.debug)))
try:
self.qdb.write('/template', self.template.name)
self.qdb.write('/qubes-base-template', self.template.name)
except AttributeError:
self.qdb.write('/template', '')
self.qdb.write('/qubes-base-template', '')
self.qdb.write('/random-seed',
self.qdb.write('/qubes-random-seed',
base64.b64encode(qubes.utils.urandom(64)))
if self.provides_network:
@ -1483,16 +1484,18 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
for i, addr in zip(itertools.count(start=1), self.dns):
self.qdb.write('/network/dns-{}'.format(i), addr)
tzname = qubes.utils.get_timezone()
if tzname:
self.qdb.write('/timezone', tzname)
self.qdb.write('/qubes-timezone', tzname)
for feature, value in self.features.items():
self.qdb.write('/features/{0}'.format(feature),
str(value) if value else '')
self.qdb.write('/devices/block', '')
self.qdb.write('/devices/usb', '')
self.qdb.write('/qubes-block-devices', '')
self.qdb.write('/qubes-usb-devices', '')
# TODO: Currently the whole qmemman is quite Xen-specific, so stay with
# xenstore for it until decided otherwise