Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow manually update dom0 from GUI

Browse Source
This commit is contained in:
Marek Marczykowski 2011-12-18 14:03:16 +01:00
parent d1d254fa18
commit 2777f7686b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubesmanager/main.py
View File

@ -632,7 +632,7 @@ class VmManagerWindow(QMainWindow):
self.action_shutdownvm.setEnabled(not vm.is_netvm() and vm.last_power_state and vm.qid != 0) self.action_shutdownvm.setEnabled(not vm.is_netvm() and vm.last_power_state and vm.qid != 0)
self.action_appmenus.setEnabled(not vm.is_netvm()) self.action_appmenus.setEnabled(not vm.is_netvm())
self.action_editfwrules.setEnabled(vm.is_networked() and not (vm.is_netvm() and not vm.is_proxyvm())) self.action_editfwrules.setEnabled(vm.is_networked() and not (vm.is_netvm() and not vm.is_proxyvm()))
self.action_updatevm.setEnabled(vm.is_updateable()) self.action_updatevm.setEnabled(vm.is_updateable() or vm.qid == 0)
def get_minimum_table_width(self): def get_minimum_table_width(self):
tbl_W = 0 tbl_W = 0
@ -910,6 +910,7 @@ class VmManagerWindow(QMainWindow):
app.processEvents() app.processEvents()
time.sleep (0.2) time.sleep (0.2)
if vm.qid != 0:
if thread_monitor.success: if thread_monitor.success:
# gpk-update-viewer was started, don't know if user installs updates, but touch stat file anyway # gpk-update-viewer was started, don't know if user installs updates, but touch stat file anyway
open(vm.dir_path + '/' + updates_stat_file, 'w').close() open(vm.dir_path + '/' + updates_stat_file, 'w').close()
@ -918,6 +919,9 @@ class VmManagerWindow(QMainWindow):
def do_update_vm(self, vm, thread_monitor): def do_update_vm(self, vm, thread_monitor):
try: try:
if vm.qid == 0:
subprocess.check_call (["/usr/bin/qvm-dom0-update", "--gui"])
else:
qubesutils.run_in_vm(vm, "user:gpk-update-viewer", verbose=False, autostart=True) qubesutils.run_in_vm(vm, "user:gpk-update-viewer", verbose=False, autostart=True)
except Exception as ex: except Exception as ex:
thread_monitor.set_error_msg(str(ex)) thread_monitor.set_error_msg(str(ex))