Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: inherit kernelopts from the template by default

Browse Source 
Fixes qubesos/qubes-issues#1091
This commit is contained in:
Marek Marczykowski-Górecki 2015-08-05 01:43:43 +02:00
parent 7e79cd20a8
commit da0e5dd4ba
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core-modules/000QubesVm.py
View File

@ -146,6 +146,7 @@ class QubesVm(object):
"order": 31, "order": 31,
"func": lambda value: value if not self.uses_default_kernelopts\ "func": lambda value: value if not self.uses_default_kernelopts\
else defaults["kernelopts_pcidevs"] if len(self.pcidevs)>0 \ else defaults["kernelopts_pcidevs"] if len(self.pcidevs)>0 \
else self.template.kernelopts if self.template
else defaults["kernelopts"] }, else defaults["kernelopts"] },
"mac": { "attr": "_mac", "default": None }, "mac": { "attr": "_mac", "default": None },
"include_in_backups": { "include_in_backups": {

6
doc/qvm-tools/qvm-prefs.rst
View File

@ -111,8 +111,10 @@ kernelopts
VM kernel parameters (available only for PV VMs). This can be used to VM kernel parameters (available only for PV VMs). This can be used to
workaround some hardware specific problems (eg for NetVM). Setting to workaround some hardware specific problems (eg for NetVM). Setting to
``default`` will use some reasonable defaults (currently different for VMs ``default`` will use some reasonable defaults (currently different for VMs
with PCI devices and without). Some helpful options (for debugging with PCI devices and without). For VM without PCI devices
purposes): ``earlyprintk=xen``, ``init=/bin/bash`` ``default`` option means inherit this value from the VM template (if any).
Some helpful options (for debugging purposes): ``earlyprintk=xen``,
``init=/bin/bash``
name name
Accepted values: alphanumerical name Accepted values: alphanumerical name