kernel_params contains kernel_append_root delete kernel_append_root in job.yaml Signed-off-by: Wu Zhende <wuzhende666@163.com> --- src/lib/job.cr | 2 -- src/scheduler/kernel_params.cr | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 55bac7f..6f81172 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -92,7 +92,6 @@ class Job lkp_initrd_user user_lkp_src kernel_uri - kernel_append_root kernel_params docker_image kernel_version @@ -151,7 +150,6 @@ class Job set_kernel_version() set_initrds_uri() set_kernel_uri() - set_kernel_append_root() set_kernel_params() set_lkp_server() set_sshr_info() diff --git a/src/scheduler/kernel_params.cr b/src/scheduler/kernel_params.cr index 2cc8172..0afe692 100644 --- a/src/scheduler/kernel_params.cr +++ b/src/scheduler/kernel_params.cr @@ -11,7 +11,7 @@ class Job return @hash["kernel_custom_params"] if @hash["kernel_custom_params"]? end - private def set_kernel_append_root + def kernel_append_root os_real_path = JobHelper.service_path("#{SRV_OS}/#{os_dir}") fs2root = { @@ -22,7 +22,7 @@ class Job "container" => "", } - self["kernel_append_root"] = fs2root[os_mount] + fs2root[os_mount] end private def kernel_console @@ -30,7 +30,7 @@ class Job end private def set_kernel_params - self["kernel_params"] = " #{kernel_common_params()} #{kernel_custom_params()} #{kernel_append_root} #{kernel_console()}" + self["kernel_params"] = " #{kernel_common_params()} #{kernel_custom_params()} #{self.kernel_append_root} #{kernel_console()}" end end -- 2.23.0