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

Merge remote-tracking branch 'qubesos/pr/130'

Browse Source 
* qubesos/pr/130:
  qubes: have "service" features' keys separated by period
This commit is contained in:
Marek Marczykowski-Górecki 2017-07-14 01:04:42 +02:00
commit 63bac15b25
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qubes/app.py
View File

@ -806,13 +806,13 @@ class Qubes(qubes.PropertyHolder):
# Disable ntpd in ClockVM - to not conflict with ntpdate (both are # Disable ntpd in ClockVM - to not conflict with ntpdate (both are
# using 123/udp port) # using 123/udp port)
if hasattr(self, 'clockvm') and self.clockvm is not None: if hasattr(self, 'clockvm') and self.clockvm is not None:
if self.clockvm.features.get('service/ntpd', False): if self.clockvm.features.get('service.ntpd', False):
self.log.warning( self.log.warning(
'VM set as clockvm (%r) has enabled \'ntpd\' service! ' 'VM set as clockvm (%r) has enabled \'ntpd\' service! '
'Expect failure when syncing time in dom0.', 'Expect failure when syncing time in dom0.',
self.clockvm) self.clockvm)
else: else:
self.clockvm.features['service/ntpd'] = '' self.clockvm.features['service.ntpd'] = ''
for vm in self.domains: for vm in self.domains:
vm.events_enabled = True vm.events_enabled = True
@ -1149,12 +1149,12 @@ class Qubes(qubes.PropertyHolder):
# pylint: disable=unused-argument,no-self-use # pylint: disable=unused-argument,no-self-use
if newvalue is None: if newvalue is None:
return return
if newvalue.features.get('service/ntpd', False): if newvalue.features.get('service.ntpd', False):
raise qubes.exc.QubesVMError(newvalue, raise qubes.exc.QubesVMError(newvalue,
'Cannot set {!r} as {!r} since it has ntpd enabled.'.format( 'Cannot set {!r} as {!r} since it has ntpd enabled.'.format(
newvalue.name, name)) newvalue.name, name))
else: else:
newvalue.features['service/ntpd'] = '' newvalue.features['service.ntpd'] = ''
@qubes.events.handler( @qubes.events.handler(

2
qubes/ext/r3compatibility.py
View File

@ -38,7 +38,7 @@ class R3Compatibility(qubes.ext.Extension):
''' '''
features_to_services = { features_to_services = {
'service/ntpd': 'ntpd', 'service.ntpd': 'ntpd',
'check-updates': 'qubes-update-check', 'check-updates': 'qubes-update-check',
'dvm': 'qubes-dvm', 'dvm': 'qubes-dvm',

2
qubes/tests/integ/backup.py
View File

@ -104,7 +104,7 @@ class BackupTestsMixin(qubes.tests.SystemTestsMixin):
name=vmname, template=template, provides_network=True, name=vmname, template=template, provides_network=True,
label='red') label='red')
testnet.create_on_disk(pool=pool) testnet.create_on_disk(pool=pool)
testnet.features['services/ntpd'] = True testnet.features['service.ntpd'] = True
vms.append(testnet) vms.append(testnet)
self.fill_image(testnet.storage.export('private'), 20*1024*1024) self.fill_image(testnet.storage.export('private'), 20*1024*1024)

2
qubes/tests/integ/vm_qrexec_gui.py
View File

@ -819,7 +819,7 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
self.testvm1.maxmem = 800 self.testvm1.maxmem = 800
# exclude from memory balancing # exclude from memory balancing
self.testvm1.features['services/meminfo-writer'] = False self.testvm1.features['service.meminfo-writer'] = False
yield from self.testvm1.start() yield from self.testvm1.start()
yield from self.wait_for_session(self.testvm1) yield from self.wait_for_session(self.testvm1)

4
qubes/vm/qubesvm.py
View File

@ -1736,9 +1736,9 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
self.qdb.write('/qubes-timezone', tzname) self.qdb.write('/qubes-timezone', tzname)
for feature, value in self.features.items(): for feature, value in self.features.items():
if not feature.startswith('service/'): if not feature.startswith('service.'):
continue continue
service = feature[len('service/'):] service = feature[len('service.'):]
# forcefully convert to '0' or '1' # forcefully convert to '0' or '1'
self.qdb.write('/qubes-service/{}'.format(service), self.qdb.write('/qubes-service/{}'.format(service),
str(int(bool(value)))) str(int(bool(value))))