← Back to branch summary

~evilnick/maas/1.2-docs-tidyup+preseed

« back to all changes in this revision

Viewing changes to src/provisioningserver/kernel_opts.py

[r=julian-edwards][bug=][author=jameinel] Expose the new kernel options to the pxeconfig api.

Add the extra options to KernelParameters, and return them when the tftp server places its request.
Tweak the tftp server so that it adds the new parameters to the commandline.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/kernel_opts.py
37
37
        "preseed_url",  # URL from which a preseed can be obtained.
38
38
        "log_host",  # Host/IP to which syslog can be streamed.
39
39
        "fs_host",  # Host/IP on which ephemeral filesystems are hosted.
 
40
        "extra_opts", # String of extra options to supply, will be appended
 
41
                      # verbatim to the kernel command line
40
42
        ))
41
43
 
42
44
 
176
178
    #       as it would be nice to have.
177
179
    options += compose_logging_opts(params.log_host)
178
180
    options += compose_arch_opts(params)
 
181
    if params.extra_opts:
 
182
        options.append(params.extra_opts)
179
183
    return ' '.join(options)