From f2d8444efbb5782b17ed87a0d27cfa64db1fce7e Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Thu, 26 May 2011 13:58:15 +0200 Subject: [PATCH 01/10] version 1.5.28-vm --- version_vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_vm b/version_vm index f93a854f..ac2f82cb 100644 --- a/version_vm +++ b/version_vm @@ -1 +1 @@ -1.5.27 +1.5.28 From 3154ce2e9059dd2545b49e946680e7c2825784cc Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Fri, 24 Jun 2011 23:00:40 +0200 Subject: [PATCH 02/10] Makefile: automaically copy rpms to _all_ vm repos --- Makefile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 881b6a4f..aea9b2f6 100644 --- a/Makefile +++ b/Makefile @@ -29,23 +29,28 @@ rpms-vaio-fixes: update-repo-current: ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/current/dom0/rpm/ ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*fc13*.rpm ../yum/current-release/current/dom0/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc13*.rpm ../yum/current-release/current/vm/f13/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/current/vm/f14/rpm/ + for vmrepo in ../yum/current-release/current/vm/* ; do \ + dist=$$(basename $$vmrepo) ;\ + ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ + done cd ../yum && ./update_repo.sh update-repo-current-testing: ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/current-testing/dom0/rpm/ ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*fc13*.rpm ../yum/current-release/current-testing/dom0/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc13*.rpm ../yum/current-release/current-testing/vm/f13/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/current-testing/vm/f14/rpm/ + for vmrepo in ../yum/current-release/current-testing/vm/* ; do \ + dist=$$(basename $$vmrepo) ;\ + ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ + done cd ../yum && ./update_repo.sh - update-repo-unstable: ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/unstable/dom0/rpm/ ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*fc13*.rpm ../yum/current-release/unstable/dom0/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc13*.rpm ../yum/current-release/unstable/vm/f13/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/unstable/vm/f14/rpm/ + for vmrepo in ../yum/current-release/unstable/vm/* ; do \ + dist=$$(basename $$vmrepo) ;\ + ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ + done cd ../yum && ./update_repo.sh update-repo-installer: From 74550bf9491218467677fcc67d8025c22dd32207 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Thu, 30 Jun 2011 20:47:48 +0200 Subject: [PATCH 03/10] Makefile: don't autoupdate yum repo after copying rpms there --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index aea9b2f6..8f98ae4c 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,6 @@ update-repo-current: dist=$$(basename $$vmrepo) ;\ ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ done - cd ../yum && ./update_repo.sh update-repo-current-testing: ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/current-testing/dom0/rpm/ @@ -42,7 +41,6 @@ update-repo-current-testing: dist=$$(basename $$vmrepo) ;\ ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ done - cd ../yum && ./update_repo.sh update-repo-unstable: ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/unstable/dom0/rpm/ @@ -51,7 +49,6 @@ update-repo-unstable: dist=$$(basename $$vmrepo) ;\ ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ done - cd ../yum && ./update_repo.sh update-repo-installer: ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-*$(VERSION_DOM0)*fc13*.rpm ../installer/yum/qubes-dom0/rpm/ From bfa03d5fb95de74f35578d2c040018c78eca2a21 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Fri, 1 Jul 2011 22:56:11 +0200 Subject: [PATCH 04/10] Update VM yum repos confs for Beta2 --- common/qubes.fc13.repo | 6 +++--- common/qubes.fc14.repo | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/qubes.fc13.repo b/common/qubes.fc13.repo index 982b095e..376b4908 100644 --- a/common/qubes.fc13.repo +++ b/common/qubes.fc13.repo @@ -1,19 +1,19 @@ [qubes-vm-current] name = Qubes OS Repository for VM (updates) -baseurl = http://yum.qubes-os.org/r1-beta1/current/vm/f13 +baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc13 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgcheck = 1 [qubes-vm-current-testing] name = Qubes OS Repository for VM (updates-testing) -baseurl = http://yum.qubes-os.org/r1-beta1/current-testing/vm/f13 +baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc13 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgcheck = 1 enabled=0 [qubes-vm-unstable] name = Qubes OS Repository for VM (unstable) -baseurl = http://yum.qubes-os.org/r1-beta1/unstable/vm/f13 +baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc13 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgcheck = 1 enabled=0 diff --git a/common/qubes.fc14.repo b/common/qubes.fc14.repo index b10c80c9..2020d1e5 100644 --- a/common/qubes.fc14.repo +++ b/common/qubes.fc14.repo @@ -1,19 +1,19 @@ [qubes-vm-current] name = Qubes OS Repository for VM (updates) -baseurl = http://yum.qubes-os.org/r1-beta1/current/vm/f14 +baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc14 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgcheck = 1 [qubes-vm-current-testing] name = Qubes OS Repository for VM (updates-testing) -baseurl = http://yum.qubes-os.org/r1-beta1/current-testing/vm/f14 +baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc14 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgcheck = 1 enabled=0 [qubes-vm-unstable] name = Qubes OS Repository for VM (unstable) -baseurl = http://yum.qubes-os.org/r1-beta1/unstable/vm/f14 +baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc14 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgcheck = 1 enabled=0 From 1023109c017c62f33288dcf27b14bc21f3251d27 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sat, 2 Jul 2011 00:30:28 +0200 Subject: [PATCH 05/10] version: 1.6.5 --- version_dom0 | 2 +- version_vm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version_dom0 b/version_dom0 index 9edc58bb..9f05f9f2 100644 --- a/version_dom0 +++ b/version_dom0 @@ -1 +1 @@ -1.6.4 +1.6.5 diff --git a/version_vm b/version_vm index 9edc58bb..9f05f9f2 100644 --- a/version_vm +++ b/version_vm @@ -1 +1 @@ -1.6.4 +1.6.5 From 26a9b7754514bae4dabf57808c9be22e2b560416 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sat, 2 Jul 2011 13:12:53 +0200 Subject: [PATCH 06/10] vm: Load evtchn module in qubes_core --- common/qubes_core | 1 + 1 file changed, 1 insertion(+) diff --git a/common/qubes_core b/common/qubes_core index b941efb0..fbc48d49 100755 --- a/common/qubes_core +++ b/common/qubes_core @@ -15,6 +15,7 @@ start() exit 1 fi + modprobe evtchn modprobe u2mfn # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read From 88098ae69ba62e4dbeccd5f92d5616e26127b197 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sat, 2 Jul 2011 13:14:57 +0200 Subject: [PATCH 07/10] vm: qubes_core ident fixes --- common/qubes_core | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/qubes_core b/common/qubes_core index fbc48d49..fb2d30c6 100755 --- a/common/qubes_core +++ b/common/qubes_core @@ -15,11 +15,11 @@ start() exit 1 fi - modprobe evtchn - modprobe u2mfn + modprobe evtchn + modprobe u2mfn - # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read - chmod 666 /proc/xen/xenbus + # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read + chmod 666 /proc/xen/xenbus name=$(/usr/bin/xenstore-read name) if ! [ -f /etc/this_is_dvm ] ; then From 8d926960f531071e043601f04b1690193eb9fd12 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sat, 2 Jul 2011 13:18:11 +0200 Subject: [PATCH 08/10] Dom0: Do not try to load non-existent xen-pciback module... Load just the pciback, which is how it is named on our kernels, and do not scare the user with weired error messages. --- dom0/aux-tools/unbind_all_network_devices | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dom0/aux-tools/unbind_all_network_devices b/dom0/aux-tools/unbind_all_network_devices index cea737b1..fd589ab4 100755 --- a/dom0/aux-tools/unbind_all_network_devices +++ b/dom0/aux-tools/unbind_all_network_devices @@ -53,12 +53,10 @@ def main(): if options.verbose: print "Loading Xen PCI Backend..." - retcode = subprocess.call (["/sbin/modprobe", "xen-pciback"]) + retcode = subprocess.call (["/sbin/modprobe", "pciback"]) if retcode != 0: - retcode = subprocess.call (["/sbin/modprobe", "pciback"]) - if retcode != 0: - print "ERROR: Cannot load xen-pciback module!" - exit(1) + print "ERROR: Cannot load the pciback module!" + exit(1) if options.verbose: print "Unbinding the following net devices:" From 1ef800414aa53aa84d532a42ba8ad953a81fbbeb Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sat, 2 Jul 2011 13:30:10 +0200 Subject: [PATCH 09/10] Dom0: qubes.py: honor the verbose flag when printing debuging messages --- dom0/qvm-core/qubes.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py index 2deeab95..7f269721 100755 --- a/dom0/qvm-core/qubes.py +++ b/dom0/qvm-core/qubes.py @@ -720,7 +720,7 @@ class QubesVm(object): format(template_root, self.root_img)) # Create volatile.img - self.reset_volatile_storage(source_template = source_template) + self.reset_volatile_storage(source_template = source_template, verbose=verbose) def create_appmenus(self, verbose, source_template = None): if source_template is None: @@ -770,7 +770,7 @@ class QubesVm(object): format(self.kernels_dir + '/modules.img')) return True - def reset_volatile_storage(self, source_template = None): + def reset_volatile_storage(self, source_template = None, verbose = False): assert not self.is_running(), "Attempt to clean volatile image of running VM!" if source_template is None: @@ -780,7 +780,8 @@ class QubesVm(object): if source_template is None: return - print "--> Cleaning volatile image: {0}...".format (self.volatile_img) + if verbose: + print "--> Cleaning volatile image: {0}...".format (self.volatile_img) if dry_run: return if os.path.exists (self.volatile_img): @@ -897,7 +898,7 @@ class QubesVm(object): print "--> Starting NetVM {0}...".format(self.netvm_vm.name) self.netvm_vm.start() - self.reset_volatile_storage() + self.reset_volatile_storage(verbose=verbose) if verbose: print "--> Loading the VM (type = {0})...".format(self.type) @@ -1134,7 +1135,7 @@ class QubesTemplateVm(QubesVm): os.symlink (icon_path, self.icon_path) # Create root-cow.img - self.commit_changes() + self.commit_changes(verbose=verbose) # Create appmenus self.create_appmenus(verbose, source_template = src_template_vm) @@ -1200,7 +1201,7 @@ class QubesTemplateVm(QubesVm): if dry_run: return - self.reset_volatile_storage() + self.reset_volatile_storage(verbose=verbose) if not self.is_updateable(): raise QubesException ("Cannot start Template VM that is marked \"nonupdatable\"") @@ -1209,10 +1210,11 @@ class QubesTemplateVm(QubesVm): return super(QubesTemplateVm, self).start(debug_console=debug_console, verbose=verbose) - def reset_volatile_storage(self): + def reset_volatile_storage(self, verbose = False): assert not self.is_running(), "Attempt to clean volatile image of running Template VM!" - print "--> Cleaning volatile image: {0}...".format (self.volatile_img) + if verbose: + print "--> Cleaning volatile image: {0}...".format (self.volatile_img) if dry_run: return if os.path.exists (self.volatile_img): @@ -1223,11 +1225,12 @@ class QubesTemplateVm(QubesVm): raise IOError ("Error while unpacking {0} to {1}".\ format(self.template_vm.clean_volatile_img, self.volatile_img)) - def commit_changes (self): + def commit_changes (self, verbose = False): assert not self.is_running(), "Attempt to commit changes on running Template VM!" - print "--> Commiting template updates... COW: {0}...".format (self.rootcow_img) + if verbose: + print "--> Commiting template updates... COW: {0}...".format (self.rootcow_img) if dry_run: return From a9a238579d88140738893420bbbf7ec6d31f9a95 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sat, 2 Jul 2011 13:36:19 +0200 Subject: [PATCH 10/10] version 1.6.6 --- version_dom0 | 2 +- version_vm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version_dom0 b/version_dom0 index 9f05f9f2..ec70f755 100644 --- a/version_dom0 +++ b/version_dom0 @@ -1 +1 @@ -1.6.5 +1.6.6 diff --git a/version_vm b/version_vm index 9f05f9f2..ec70f755 100644 --- a/version_vm +++ b/version_vm @@ -1 +1 @@ -1.6.5 +1.6.6