xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 09:36:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7107 from gurevichmark/sles15.3_addkcmdline2

Browse Source 
Handle SLES15 persistent kcmdline attribute (2)
This commit is contained in:
besawn 2022-02-11 12:07:40 -05:00 committed by GitHub
commit 17b5e0bdcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/guides/admin-guides/references/man5/bootparams.5.rst
View File

@ -62,7 +62,7 @@ bootparams Attributes:
\ **addkcmdline**\
User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" ")
User specified kernel options for os provision process (no prefix) or the provisioned os (with prefix "R::"). Multiple options should be delimited with spaces(" ") and surrounded with quotes. To have the same option used for os provision process and for provisioned os, specify that option with and without the prefix: addkcmdline="R::display=3 display=3"

2
docs/source/guides/admin-guides/references/man7/group.7.rst
View File

@ -41,7 +41,7 @@ group Attributes:
\ **addkcmdline**\ (bootparams.addkcmdline)
User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" ")
User specified kernel options for os provision process (no prefix) or the provisioned os (with prefix "R::"). Multiple options should be delimited with spaces(" ") and surrounded with quotes. To have the same option used for os provision process and for provisioned os, specify that option with and without the prefix: addkcmdline="R::display=3 display=3"

2
docs/source/guides/admin-guides/references/man7/node.7.rst
View File

@ -41,7 +41,7 @@ node Attributes:
\ **addkcmdline**\ (bootparams.addkcmdline)
User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" ")
User specified kernel options for os provision process (no prefix) or the provisioned os (with prefix "R::"). Multiple options should be delimited with spaces(" ") and surrounded with quotes. To have the same option used for os provision process and for provisioned os, specify that option with and without the prefix: addkcmdline="R::display=3 display=3"

2
perl-xCAT/xCAT/Schema.pm
View File

@ -343,7 +343,7 @@ passed as argument rather than by table value',
'kernel' => 'The kernel that network boot actions should currently acquire and use. Note this could be a chained boot loader such as memdisk or a non-linux boot loader',
'initrd' => 'The initial ramdisk image that network boot actions should use (could be a DOS floppy or hard drive image if using memdisk as kernel)',
'kcmdline' => '(Deprecated, use addkcmdline instead) Arguments to be passed to the kernel.',
'addkcmdline' => 'User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" ")',
'addkcmdline' => 'User specified kernel options for os provision process (no prefix) or the provisioned os (with prefix "R::"). Multiple options should be delimited with spaces(" ") and surrounded with quotes. To have the same option used for os provision process and for provisioned os, specify that option with and without the prefix: addkcmdline="R::display=3 display=3"',
'dhcpstatements' => 'xCAT manipulated custom dhcp statements (not intended for user manipulation)',
'adddhcpstatements' => 'Custom dhcp statements for administrator use (not implemneted yet)',
comments => 'Any user-written notes.',

1
xCAT-server/share/xcat/install/sles/compute.sle15.tmpl
View File

@ -4,6 +4,7 @@
<bootloader>
<global>
<activate>true</activate>
<append>#XCATVAR:PERSKCMDLINE#</append>
</global>
</bootloader>
<general>

1
xCAT-server/share/xcat/install/sles/service.sle15.tmpl
View File

@ -4,6 +4,7 @@
<bootloader>
<global>
<activate>true</activate>
<append>#XCATVAR:PERSKCMDLINE#</append>
</global>
</bootloader>
<general>