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

qubes/vm/qubesvm: remove prefixes from qubesdb keys

Browse Source
This commit is contained in:
Wojtek Porczyk 2016-01-24 02:09:27 +01:00
parent e8bedcd7ba
commit 2d6ad3b60c
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qubes/vm/qubesvm.py
View File

@ -1500,8 +1500,9 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
# pylint: disable=no-member # pylint: disable=no-member
self.qdb.write('/name', self.name) self.qdb.write('/name', self.name)
self.qdb.write('/qubes-vm-type', self.__class__.__name__) self.qdb.write('/type', self.__class__.__name__)
self.qdb.write('/qubes-vm-updateable', str(self.updateable)) self.qdb.write('/updateable', str(self.updateable))
self.qdb.write('/debug', str(int(self.debug)))
if self.provides_network: if self.provides_network:
self.qdb.write('/network-provider/gateway', self.gateway) self.qdb.write('/network-provider/gateway', self.gateway)
@ -1518,21 +1519,17 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
for i, addr in zip(itertools.count(start=1), self.dns): for i, addr in zip(itertools.count(start=1), self.dns):
self.qdb.write('/network/dns-{}'.format(i), addr) self.qdb.write('/network/dns-{}'.format(i), addr)
tzname = qubes.utils.get_timezone() tzname = qubes.utils.get_timezone()
if tzname: if tzname:
self.qdb.write('/qubes-timezone', tzname) self.qdb.write('/timezone', tzname)
for srv in self.services.keys(): for srv in self.services.keys():
# convert True/False to "1"/"0" # convert True/False to "1"/"0"
self.qdb.write('/qubes-service/{0}'.format(srv), self.qdb.write('/qubes-service/{0}'.format(srv),
str(int(self.services[srv]))) str(int(self.services[srv])))
self.qdb.write('/qubes-block-devices', '') self.qdb.write('/devices/block', '')
self.qdb.write('/devices/usb', '')
self.qdb.write('/qubes-usb-devices', '')
self.qdb.write('/qubes-debug-mode', str(int(self.debug)))
# TODO: Currently the whole qmemman is quite Xen-specific, so stay with # TODO: Currently the whole qmemman is quite Xen-specific, so stay with
# xenstore for it until decided otherwise # xenstore for it until decided otherwise