From 7170e01b53515c31dbb42c6b268bc1584bc6cf10 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Wed, 18 Jul 2012 12:08:19 +0200 Subject: [PATCH 1/7] comps: use f17 template --- conf/comps-qubes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml index f7ba76a..b2e2b34 100644 --- a/conf/comps-qubes.xml +++ b/conf/comps-qubes.xml @@ -99,7 +99,7 @@ qubes-gui-dom0 qubes-logos qubes-manager - qubes-template-fedora-15-x64 + qubes-template-fedora-17-x64 qubes-gpg-split-dom0 From 4ebd8a16c7379be76606a6477e4d7169f3642331 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Wed, 18 Jul 2012 22:43:45 +0200 Subject: [PATCH 2/7] R1-rc1-pre2 --- conf/qubes-install.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/qubes-install.conf b/conf/qubes-install.conf index dea9747..db720bb 100644 --- a/conf/qubes-install.conf +++ b/conf/qubes-install.conf @@ -31,7 +31,7 @@ product_name = Qubes product_path = Packages iso_basename = Qubes iso_label = Qubes -version = R1-rc1pre1 +version = R1-rc1pre2 version_from = F13 comps_filter = 0 revisor_comps = 1 From 6a7982b7e05a9907c2136711566761e1a632ef61 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Fri, 20 Jul 2012 13:37:07 +0200 Subject: [PATCH 3/7] R1-rc1-pre3 --- conf/qubes-install.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/qubes-install.conf b/conf/qubes-install.conf index db720bb..0abbbec 100644 --- a/conf/qubes-install.conf +++ b/conf/qubes-install.conf @@ -31,7 +31,7 @@ product_name = Qubes product_path = Packages iso_basename = Qubes iso_label = Qubes -version = R1-rc1pre2 +version = R1-rc1pre3 version_from = F13 comps_filter = 0 revisor_comps = 1 From 0e9488661172f8447b66400f35fa431f7e653592 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Fri, 20 Jul 2012 13:02:19 +0200 Subject: [PATCH 4/7] firstboot: configure all installed templates --- firstboot/modules/qubes_setup.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/firstboot/modules/qubes_setup.py b/firstboot/modules/qubes_setup.py index d6b4a33..7932134 100644 --- a/firstboot/modules/qubes_setup.py +++ b/firstboot/modules/qubes_setup.py @@ -197,13 +197,14 @@ class moduleClass(Module): def do_configure_template(self): subprocess.check_call(['/bin/mkdir', '-p', '/mnt/template-root']) - subprocess.check_call(['/bin/mount', '-oloop', - '/var/lib/qubes/vm-templates/fedora-15-x64/root.img', - '/mnt/template-root']) - # Copy timezone setting from Dom0 to template - subprocess.check_call(['cp', '/etc/localtime', '/mnt/template-root/etc']) - subprocess.check_call(['cp', '/etc/ntp.conf', '/mnt/template-root/etc']) - subprocess.check_call(['/bin/umount', '/mnt/template-root']) + for template in os.listdir('/var/lib/qubes/vm-templates'): + subprocess.check_call(['/bin/mount', '-oloop', + '/var/lib/qubes/vm-templates/%s/root.img' % template, + '/mnt/template-root']) + # Copy timezone setting from Dom0 to template + subprocess.check_call(['cp', '/etc/localtime', '/mnt/template-root/etc']) + subprocess.check_call(['cp', '/etc/ntp.conf', '/mnt/template-root/etc']) + subprocess.check_call(['/bin/umount', '/mnt/template-root']) def do_create_appvms(self): self.run_command(['su', '-c', '/usr/bin/qvm-create work --label green', '-', self.qubes_user]) From 991e33e21040309dcf99714467f143721c8cc465 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Fri, 20 Jul 2012 13:42:24 +0200 Subject: [PATCH 5/7] R1-rc1-pre4 --- conf/qubes-install.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/qubes-install.conf b/conf/qubes-install.conf index 0abbbec..9d09d21 100644 --- a/conf/qubes-install.conf +++ b/conf/qubes-install.conf @@ -31,7 +31,7 @@ product_name = Qubes product_path = Packages iso_basename = Qubes iso_label = Qubes -version = R1-rc1pre3 +version = R1-rc1pre4 version_from = F13 comps_filter = 0 revisor_comps = 1 From 3830f8f6cf0d8018bf79186a20e3dd31d900cc0f Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Fri, 20 Jul 2012 16:46:50 +0200 Subject: [PATCH 6/7] R1-rc1-pre5 --- conf/qubes-install.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/qubes-install.conf b/conf/qubes-install.conf index 9d09d21..93d4c7a 100644 --- a/conf/qubes-install.conf +++ b/conf/qubes-install.conf @@ -31,7 +31,7 @@ product_name = Qubes product_path = Packages iso_basename = Qubes iso_label = Qubes -version = R1-rc1pre4 +version = R1-rc1pre5 version_from = F13 comps_filter = 0 revisor_comps = 1 From bafb5a7a4700e305ec02b2cae3419d4624c44646 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Fri, 20 Jul 2012 23:28:04 +0200 Subject: [PATCH 7/7] R1-rc1 --- conf/qubes-install.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/qubes-install.conf b/conf/qubes-install.conf index 93d4c7a..752a7db 100644 --- a/conf/qubes-install.conf +++ b/conf/qubes-install.conf @@ -31,7 +31,7 @@ product_name = Qubes product_path = Packages iso_basename = Qubes iso_label = Qubes -version = R1-rc1pre5 +version = R1-rc1 version_from = F13 comps_filter = 0 revisor_comps = 1