Skip to content

Commit

Permalink
DRY writing
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Oct 31, 2014
1 parent 1066ee5 commit a06dbbe
Showing 1 changed file with 24 additions and 31 deletions.
55 changes: 24 additions & 31 deletions src/modules/Bootloader.rb
Expand Up @@ -374,23 +374,7 @@ def Write
Progress.Title(titles[1])
end

# Write settings to /etc/sysconfig/bootloader
log.info "Saving configuration files"
lt = getLoaderType

SCR.Write(path(".sysconfig.bootloader.LOADER_TYPE"), lt)
SCR.Write(path(".sysconfig.bootloader"), nil)


params_to_save["additional_failsafe_params"] = BootCommon.GetAdditionalFailsafeParams
params_to_save["installation_kernel_params"] = Kernel.GetCmdLine
if Stage.initial
SCR.Write(
path(".target.ycp"),
"/var/lib/YaST2/bootloader.ycp",
params_to_save
)
end
write_additional_files

return ret if getLoaderType == "none"

Expand Down Expand Up @@ -479,20 +463,7 @@ def WriteInstallation

log.error "Error occurred while creating initrd" unless ret

Ops.set(
params_to_save,
"additional_failsafe_params",
BootCommon.GetAdditionalFailsafeParams
)
Ops.set(params_to_save, "installation_kernel_params", Kernel.GetCmdLine)

if Stage.initial
SCR.Write(
path(".target.ycp"),
"/var/lib/YaST2/bootloader.ycp",
params_to_save
)
end
write_additional_files

return ret if getLoaderType == "none"

Expand Down Expand Up @@ -893,6 +864,28 @@ def CopyKernelInird
true
end

private

def write_additional_files

This comment has been minimized.

Copy link
@ancorgs

ancorgs Nov 3, 2014

Contributor

In fact, writing of /etc/sysconfig/bootloader and writing of /var/lib/YaST2/bootloader.ycp look like completely different things to me. I would define two methods with more meaningful names. Grouping everything in write_additional_files feels like too much generalization.

This comment has been minimized.

Copy link
@jreidinger

jreidinger Nov 3, 2014

Author Member

OK, make sense

# Write settings to /etc/sysconfig/bootloader
log.info "Saving configuration files"
lt = getLoaderType

SCR.Write(path(".sysconfig.bootloader.LOADER_TYPE"), lt)
SCR.Write(path(".sysconfig.bootloader"), nil)


if Stage.initial
params_to_save["additional_failsafe_params"] = BootCommon.GetAdditionalFailsafeParams
params_to_save["installation_kernel_params"] = Kernel.GetCmdLine
SCR.Write(
path(".target.ycp"),
"/var/lib/YaST2/bootloader.ycp",
params_to_save
)
end
end

publish :function => :Export, :type => "map ()"
publish :function => :Import, :type => "boolean (map)"
publish :function => :Propose, :type => "void ()"
Expand Down

0 comments on commit a06dbbe

Please sign in to comment.