Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/installer

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())

conf/comps-qubes.xml

@@ -13,6 +13,7 @@
       <packagereq type="mandatory">cryptsetup-luks</packagereq>
       <packagereq type="mandatory">dbus</packagereq>
       <packagereq type="mandatory">device-mapper-multipath</packagereq>
+      <packagereq type="mandatory">diffutils</packagereq>
       <packagereq type="mandatory">dmraid</packagereq>
       <packagereq type="mandatory">dump</packagereq>
       <packagereq type="mandatory">ed</packagereq>
@@ -49,6 +50,7 @@
       <packagereq type="mandatory">tree</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
       <packagereq type="mandatory">usbutils</packagereq>
+      <packagereq type="mandatory">vim-enhanced</packagereq>
       <packagereq type="mandatory">which</packagereq>
       <packagereq type="mandatory">yum-presto</packagereq>
       <packagereq type="mandatory">yum-utils</packagereq>

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
 
@@ -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'])

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-----

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