diff options
| author | James Laska <jlaska@redhat.com> | 2009-02-25 16:54:47 -0500 |
|---|---|---|
| committer | James Laska <jlaska@redhat.com> | 2009-03-03 11:42:26 -0500 |
| commit | 46cde3d149b2a5205bbbbe433762fe27fb1a5abe (patch) | |
| tree | 708612955a87ddc4a57f9acf20354f428df73e87 | |
| parent | 5cf82205ad74a459d3af106c822164e4f98d3da3 (diff) | |
| download | cobbler-46cde3d149b2a5205bbbbe433762fe27fb1a5abe.tar.gz cobbler-46cde3d149b2a5205bbbbe433762fe27fb1a5abe.tar.xz cobbler-46cde3d149b2a5205bbbbe433762fe27fb1a5abe.zip | |
Only system specific or profile specific arguments should live in the parm file. The kickstart should move back into the main zPXE config file as was the case previously.
| -rw-r--r-- | templates/pxeprofile_s390x.template | 9 | ||||
| -rw-r--r-- | templates/pxesystem_s390x.template | 9 | ||||
| -rw-r--r-- | templates/s390x_parm.template | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/templates/pxeprofile_s390x.template b/templates/pxeprofile_s390x.template index d4950eac..0c6f1b08 100644 --- a/templates/pxeprofile_s390x.template +++ b/templates/pxeprofile_s390x.template @@ -1,2 +1,11 @@ $kernel_path $initrd_path +## Only include kickstart URL -- all other parms in _parm and _conf files +#set $start = $append_line.find("ks=") +#set $end = $append_line.find(" ", $start) +#if $start != -1 +#if $end == -1 +#set $end = $len($append_line) +#end if +$append_line[$start:$end] +#end if diff --git a/templates/pxesystem_s390x.template b/templates/pxesystem_s390x.template index d4950eac..0c6f1b08 100644 --- a/templates/pxesystem_s390x.template +++ b/templates/pxesystem_s390x.template @@ -1,2 +1,11 @@ $kernel_path $initrd_path +## Only include kickstart URL -- all other parms in _parm and _conf files +#set $start = $append_line.find("ks=") +#set $end = $append_line.find(" ", $start) +#if $start != -1 +#if $end == -1 +#set $end = $len($append_line) +#end if +$append_line[$start:$end] +#end if diff --git a/templates/s390x_parm.template b/templates/s390x_parm.template index 42247222..f536c0d0 100644 --- a/templates/s390x_parm.template +++ b/templates/s390x_parm.template @@ -4,7 +4,6 @@ #else #set $argList = $kernel_options.split(" ") #end if -#silent $argList.insert(0, $kickstart_expanded) ## ===================================== ## Now write out data. Content cannot be longer than 80 characters in length, ## and must not exceed 11 lines |