From d5d9f287f0af694358b3de0534aa92db34d7e95b Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Tue, 7 Feb 2012 03:11:16 +0100 Subject: [PATCH 1/6] firstboot: use qubes-prefs instead of qvm-set-default-netvm (#421) --- firstboot/modules/qubes_setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firstboot/modules/qubes_setup.py b/firstboot/modules/qubes_setup.py index a727801..8fbcd0b 100644 --- a/firstboot/modules/qubes_setup.py +++ b/firstboot/modules/qubes_setup.py @@ -187,10 +187,10 @@ class moduleClass(Module): def do_set_netvm_networking(self): self.run_command(['/usr/bin/qvm-prefs', '--set', self.fwvm_name, 'netvm', self.netvm_name]) - self.run_command(['/usr/bin/qvm-set-default-netvm', self.fwvm_name]) + self.run_command(['/usr/bin/qubes-prefs', '--set', 'default-netvm', self.fwvm_name]) def do_set_dom0_networking(self): - self.run_command(['/usr/bin/qvm-set-default-netvm', 'dom0']) + self.run_command(['/usr/bin/qubes-prefs', '--set', 'default-netvm', 'dom0']) def do_start_networking(self): subprocess.check_call(['/etc/init.d/qubes_netvm', 'start']) From 5cba3ae239e2a47bad6be15337315e2809683c03 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Tue, 7 Feb 2012 16:17:05 +0100 Subject: [PATCH 2/6] anaconda: disable xen messages on VGA console (#434) --- anaconda/booty/x86.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anaconda/booty/x86.py b/anaconda/booty/x86.py index a35be2e..0299685 100644 --- a/anaconda/booty/x86.py +++ b/anaconda/booty/x86.py @@ -352,7 +352,7 @@ class x86BootloaderInfo(efiBootloaderInfo): elif version.find("xenlinux") >= 0: # Qubes kernel hvFile = "%sxen.gz" %(cfPath) - f.write('\tkernel %s\n' %(hvFile,)) + f.write('\tkernel %s console=com1\n' %(hvFile,)) f.write('\tmodule %s ro%s' %(kernelFile, realroot)) if self.args.get(): f.write(' %s' % self.args.get()) From 39331be286472bbe0e48f510eacc4659b6b16ba7 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sun, 26 Feb 2012 13:09:12 +0100 Subject: [PATCH 3/6] qubes-release: use separate key for unstable repo --- qubes-release/RPM-GPG-KEY-qubes-1-unstable | 31 ++++++++++++++++++++++ qubes-release/qubes-r1-dom0.repo | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 qubes-release/RPM-GPG-KEY-qubes-1-unstable diff --git a/qubes-release/RPM-GPG-KEY-qubes-1-unstable b/qubes-release/RPM-GPG-KEY-qubes-1-unstable new file mode 100644 index 0000000..97d5582 --- /dev/null +++ b/qubes-release/RPM-GPG-KEY-qubes-1-unstable @@ -0,0 +1,31 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.11 (GNU/Linux) + +mQENBE9KHjMBCADgs1Zw+Gag5MXDqAHzVfo/JSJ0q7Oj096l+/TU0/P2qpoF7sTo +uLpDLCfOOSqil7omOKMjn6yl/73RAd4oWIRivJMQKjgD4Tk8qlLI1NrBGhEdwyLm +SZ+7CU79HzahN8w8+l9H978obIN6S0UD36z7su42QnFmKQqT0EnD1NVZpqvq1iKC +0o0TqhZ90QE8YqWxjnbjDkk1mX2K4iHNJJ2mS/r1+4fXqvHzcmSB+vopGGGXxNB7 +fbNM6nI9RTpPecmnfKrqKrXYfHfyaLVUFXf2xZW/V85qq70dmEPi5g3YpRCXadJ+ +wKt1uZvi4xomPCxymHooF9Fplzv9MpKVIDNlABEBAAG0J1F1YmVzIE9TIFJlbGVh +c2UgMSBVbnN0YWJsZSBTaWduaW5nIEtleYkBPgQTAQIAKAUCT0ogagIbAwUJAeEz +gAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ77E0ZaTirKEbpgf8C9zqmkqo +u+dudzcrPPUW12FjK2WAYQd7WNYpBY4wOmvOUkvq68FUJ0mwNyjEkNhvLnrxlMqn +Z9vraqw1m2FwIAJfmbpnvJ6LeldNj/SYbutY9Y320eQDgLDZp5Xk0w6z1+Q1RXVJ +AkU935sXhtmVYVa4Cnk7Su6lG0Une3b5dpE90M5ewehYllqsqmtKIwqbRaBmvM6y +QHVqOJwNNo9XK78r0dKvXigXBObqatwItM2gan2oF0dplwTD//DqjldBzZ4mgrN8 +M/SZtynfTnoV8Yw7+JlsPCHIfcIXXWqJtLhNO3LqFAG6PwJX032eHNSrT+4UWIbP +q8Ccvhbxa7iNabkBDQRPSh4zAQgA7OyPodlWz93OuP8/Bh83dHDd1xV7tXByBDUX +O9am5uGKybcx3V8kBqJXbefds/aem1w2MLtDG+CxDC8Gi5gfNQNeCnIw3mpnZnMU +ZNjtXIn3VfKRyhmaHNvaNZiBzKovfjw152UuMsHfzsSMaWldj5J8oFz+eBthGJTT +uxktijIxHiZ/9RqzJLPMBQ5qRPbpqUn9piWEGxx2c4FbqeEOzzV49rX92adBPmUJ +KBo96vW+L6izE0RcQoTMhicbAqF+K2QUGzy0uTp5+G2V0q5HAfrCMIr1Zx93yuz0 +yQZNNLsGYGnYjrFjYiRpJRBbxerlCdGjlwnfXCk5EKRNuqr5twARAQABiQElBBgB +AgAPBQJPSh4zAhsMBQkB4TOAAAoJEO+xNGWk4qyh33MIAIOS9A0rkmBTPZwAsdJv +sz/J9+8AvfwMisN2sKTfEBTO8kEnSPcBZuau3JxKCGHxaPwXhGmnc9xnz/TY3JCj +6ZUgjgQQ3iT/BJk+h6n4xom9NRw5hn4j4NeIpboC6p6JfcYzZyapUNFmAsrSjakw +RxxpaVLb4moOfYzS7i7JqsEetBwoYAeFZoPYZpo4VH9PUPVAih6psmO/bz6Y8W+/ +tkXzViq15bwPUmDwBzX0nX0T8nQqMl85nCLDM2rVMs/lnVxfJas4QjTfzgeZOHQ6 +0ikGqwlnyWk/oUzUXFV/P7sKAXoOaMSEVHtfSxLjVH0RYsAv6SotjHwPAatrynyp +gYY= +=UROF +-----END PGP PUBLIC KEY BLOCK----- diff --git a/qubes-release/qubes-r1-dom0.repo b/qubes-release/qubes-r1-dom0.repo index b2bcdf2..2ac2709 100644 --- a/qubes-release/qubes-r1-dom0.repo +++ b/qubes-release/qubes-r1-dom0.repo @@ -20,5 +20,5 @@ baseurl = http://yum.qubes-os.org/r1/unstable/dom0 enabled = 0 metadata_expire = 7d gpgcheck = 1 -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-unstable From cc7d7bba4fd442b0cb9d999041d25970d5335dea Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 10 Mar 2012 22:44:08 +0100 Subject: [PATCH 4/6] firstboot: minor fix in exception handler --- firstboot/modules/qubes_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firstboot/modules/qubes_setup.py b/firstboot/modules/qubes_setup.py index 8fbcd0b..d6b4a33 100644 --- a/firstboot/modules/qubes_setup.py +++ b/firstboot/modules/qubes_setup.py @@ -90,7 +90,7 @@ class moduleClass(Module): self.show_stage("Failure...") self.progress.hide() - self.radio_dontdoanything.set_active() + self.radio_dontdoanything.set_active(True) return RESULT_FAILURE From 2061b0049e6e00c479aac42e3e1640f13201ff9c Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Tue, 3 Apr 2012 17:45:44 +0200 Subject: [PATCH 5/6] conf: install vim and diff by default in dom0 (#499) --- conf/comps-qubes.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml index 5986ad6..bed42fc 100644 --- a/conf/comps-qubes.xml +++ b/conf/comps-qubes.xml @@ -13,6 +13,7 @@ cryptsetup-luks dbus device-mapper-multipath + diff dmraid dump ed @@ -49,6 +50,7 @@ tree unzip usbutils + vim-enhanced which yum-presto yum-utils From 518800bc63428eeb40dad80928af592a9356fddc Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Wed, 18 Apr 2012 01:13:55 +0200 Subject: [PATCH 6/6] comps: diff is in diffutils package --- 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 bed42fc..765f0fe 100644 --- a/conf/comps-qubes.xml +++ b/conf/comps-qubes.xml @@ -13,7 +13,7 @@ cryptsetup-luks dbus device-mapper-multipath - diff + diffutils dmraid dump ed