From b3c2feaee948e8cd03c7d00f3504181ed9c667ed Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Fri, 20 Apr 2012 19:16:53 +0200 Subject: [PATCH 1/4] version 1.2.11 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 963ed7c..c114700 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.2.10 +1.2.11 From e97c2f89bd6258c0c70927568a93867bbd232501 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Tue, 24 Apr 2012 19:05:15 +0200 Subject: [PATCH 2/4] settings: check if volatile_img has value before showing it --- qubesmanager/settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py index 26a2a02..cc7bd4b 100644 --- a/qubesmanager/settings.py +++ b/qubesmanager/settings.py @@ -368,7 +368,10 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog): self.root_img_path.setText(self.vm.template.root_img) else: self.root_img_path.setText("n/a") - self.volatile_img_path.setText(self.vm.volatile_img) + if self.vm.volatile_img is not None: + self.volatile_img_path.setText(self.vm.volatile_img) + else: + self.volatile_img_path.setText('n/a') self.private_img_path.setText(self.vm.private_img) From 1e8f4b15698a54710a0ae3ec9a8db547ed1712c7 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Tue, 24 Apr 2012 19:14:12 +0200 Subject: [PATCH 3/4] settings: print root_img path for StandaloneVMs --- qubesmanager/settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py index cc7bd4b..d349f22 100644 --- a/qubesmanager/settings.py +++ b/qubesmanager/settings.py @@ -366,6 +366,8 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog): self.config_path.setText(self.vm.conf_file) if self.vm.template is not None: self.root_img_path.setText(self.vm.template.root_img) + elif self.vm.root_img is not None: + self.root_img_path.setText(self.vm.root_img) else: self.root_img_path.setText("n/a") if self.vm.volatile_img is not None: From 52df84877f2f0bea189542c8362b1ac201f57493 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Tue, 24 Apr 2012 19:35:26 +0200 Subject: [PATCH 4/4] fix dom0 updates --- qubesmanager/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qubesmanager/main.py b/qubesmanager/main.py index 12b42fe..5cd8d3c 100755 --- a/qubesmanager/main.py +++ b/qubesmanager/main.py @@ -1218,7 +1218,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow): def do_update_vm(self, vm, thread_monitor): try: if vm.qid == 0: - subprocess.check_call (["/usr/bin/qvm-dom0-update", "--gui"]) + subprocess.check_call (["/usr/bin/qubes-dom0-update", "--gui"]) else: vm.run("user:gpk-update-viewer", verbose=False, autostart=True) except Exception as ex: