Skip to content

Commit

Permalink
separate writting different files
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Nov 4, 2014
1 parent a511b7a commit 9b50a62
Showing 1 changed file with 16 additions and 13 deletions.
29 changes: 16 additions & 13 deletions src/modules/Bootloader.rb
Expand Up @@ -362,7 +362,8 @@ def Write
Progress.Title(titles[1])
end

write_additional_files(params_to_save)
write_sysconfig
write_proposed_params(params_to_save)

return ret if getLoaderType == "none"

Expand Down Expand Up @@ -431,7 +432,8 @@ def WriteInstallation

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

write_additional_files(params_to_save)
write_sysconfig
write_proposed_params(params_to_save)

return ret if getLoaderType == "none"

Expand Down Expand Up @@ -775,24 +777,25 @@ def CopyKernelInird

private

def write_additional_files(params_to_save)
# Write settings to /etc/sysconfig/bootloader
# Write settings to /etc/sysconfig/bootloader
def write_sysconfig
log.info "Saving configuration files"
lt = getLoaderType

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

def write_proposed_params(params_to_save)
return unless Stage.initial

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
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

def mark_as_changed
Expand Down

0 comments on commit 9b50a62

Please sign in to comment.