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

This commit is contained in:
Joanna Rutkowska 2012-07-19 12:05:34 +02:00
commit a4fedbf909

View File

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