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

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

Browse Source 
Conflicts:
	conf/comps-qubes.xml
This commit is contained in:
Joanna Rutkowska 2012-07-18 22:36:51 +02:00
commit 52f6afb477
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
anaconda/booty/x86.py
View File

@ -349,7 +349,7 @@ class x86BootloaderInfo(efiBootloaderInfo):
if initrd: if initrd:
f.write('\tmodule %s%s\n' % (cfPath, initrd)) f.write('\tmodule %s%s\n' % (cfPath, initrd))
elif version.find("xenlinux") >= 0: elif version.find("xenlinux") >= 0 || version.find("pvops") >= 0:
# Qubes kernel # Qubes kernel
hvFile = "%sxen.gz" %(cfPath) hvFile = "%sxen.gz" %(cfPath)
f.write('\tkernel %s console=com1\n' %(hvFile,)) f.write('\tkernel %s console=com1\n' %(hvFile,))

1
conf/comps-qubes.xml
View File

@ -100,6 +100,7 @@
<packagereq type="mandatory">qubes-logos</packagereq> <packagereq type="mandatory">qubes-logos</packagereq>
<packagereq type="mandatory">qubes-manager</packagereq> <packagereq type="mandatory">qubes-manager</packagereq>
<packagereq type="mandatory">qubes-template-fedora-17-x64</packagereq> <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-gpg-split-dom0</packagereq>
</packagelist> </packagelist>
</group> </group>