Skip to content

Commit 99f113a

Browse files
committed
Don't hide AdminVM as being an internal qube
1 parent f67655c commit 99f113a

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

qubesmanager/backup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,7 @@ def __init__(self, qt_app, qubes_app, dispatcher, parent=None):
124124
filter_function=(lambda vm:
125125
vm.klass != 'TemplateVM'
126126
and utils.is_running(vm, False)
127-
and not utils.get_feature(vm, 'internal', False)),
128-
allow_internal=True,
127+
),
129128
)
130129
self.appvm_combobox.setCurrentIndex(
131130
self.appvm_combobox.findText("dom0"))

qubesmanager/bootfromdevice.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ def __init_buttons__(self):
113113
and vm.klass != "TemplateVM"
114114
and not utils.get_feature(vm, "internal", False)
115115
),
116-
allow_internal=True
117116
)
118117

119118
device_choice = []

qubesmanager/utils.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,9 @@ def set_organization():
7575
QtCore.QCoreApplication.setApplicationName('qubes-qube-manager')
7676

7777
def is_internal(vm):
78-
"""checks if the VM is either an AdminVM or has the 'internal' features"""
78+
"""checks if the VM has the 'internal' features"""
7979
try:
80-
return (vm.klass == 'AdminVM'
81-
or vm.features.get('internal', False))
80+
return vm.features.get('internal', False)
8281
except exc.QubesDaemonAccessError:
8382
return False
8483

@@ -278,8 +277,7 @@ def initialize_widget_with_vms(
278277
:param property_name: name of the property
279278
:param allow_default: should a position with qubesadmin.DEFAULT be added;
280279
default False
281-
:param allow_internal: should AdminVMs and vms with feature 'internal' be
282-
used
280+
:param allow_internal: should vms with feature 'internal' be used
283281
:return:
284282
"""
285283
choices = []

0 commit comments

Comments
 (0)