QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hvm'

Browse Source 
Conflicts:
	Makefile
	anaconda/booty/x86.py
	conf/qubes-install.conf
This commit is contained in:
Marek Marczykowski 2012-10-18 03:52:34 +02:00
commit ad1bc1cf59
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/comps-qubes.xml
View File

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

2
conf/qubes-install.conf
View File

@ -31,7 +31,7 @@ product_name = Qubes
product_path = Packages
iso_basename = Qubes
iso_label = Qubes
version = R1
version = R2-Alpha1-2
version_from = F13
comps_filter = 0
revisor_comps = 1

8
qubes-release/qubes-pro-dom0.repo Normal file
View File

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

1
qubes-release/qubes-release.spec
View File

@ -95,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