Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/installer into hvm

Makefile

@@ -98,6 +98,7 @@ iso:
 	cp rpm_verify /usr/local/bin/
 	ln -sf `pwd` /tmp/qubes-installer
 	revisor --cli --config=conf/qubes-install.conf --model=qubes-x86_64 --install-dvd
+	isohybrid build/ISO/qubes-x86_64/iso/*.iso
 	rpm_verify build/work/revisor-install/R?-*/qubes-x86_64/x86_64/os/Packages/*.rpm
 
 clean:

conf/comps-qubes.xml

@@ -101,6 +101,7 @@
       <packagereq type="mandatory">qubes-manager</packagereq>
       <packagereq type="mandatory">qubes-template-fedora-15-x64</packagereq>
       <packagereq type="default">qubes-gpg-split-dom0</packagereq>
+      <packagereq type="default">qubes-core-dom0-pvdrivers-win7</packagereq>
     </packagelist>
   </group>
 </comps>

qubes-release/qubes-pro-dom0.repo

@@ -0,0 +1,8 @@
+[qubes-pro-dom0-current]
+name = Qubes Pro Dom0 Repository
+baseurl = http://10.141.1.102/yum/dom0
+enabled = 1
+metadata_expire = 7d
+gpgcheck = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
+

qubes-release/qubes-release.spec

@@ -75,7 +75,9 @@ EOF
 # On Mar 31, 2012, the Qubes signing key has changed
 # The new key is brought by this RPM, but we also
 # need to explicitly import it to RPM DB
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
+if [ $1 -gt 1 ]; then
+    rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
+fi
 
 
 %clean
@@ -93,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/yum.repos.d/fedora.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates.repo
 %config(noreplace) /etc/yum.repos.d/qubes-r1-dom0.repo
+%config(noreplace) /etc/yum.repos.d/qubes-pro-dom0.repo
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
 %config %attr(0644,root,root) /etc/rpm/macros.dist