Skip to content

Commit

Permalink
drop no longer supported arch ia64
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Oct 6, 2014
1 parent abefa40 commit 41f9c8b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 17 deletions.
18 changes: 2 additions & 16 deletions src/modules/BootArch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,6 @@ def DefaultKernelParams(resume)
end
ret = Ops.add(ret, "splash=silent quiet showopts")
return ret
elsif Arch.ia64
ret = kernel_cmdline != "" ? Ops.add(kernel_cmdline, " ") : ""
ret = Ops.add(Ops.add(ret, features), " ") if features != ""
ret = Ops.add(ret, "splash=silent quiet")

# FIXME: this does not belong here, it cannot be tracked or maintained
# and is undocumented
# on SGI Altix change kernel default hash tables sizes
if SCR.Read(path(".target.stat"), "/proc/sgi_sn") != {}
ret = Ops.add(ret, " thash_entries=2097152")
end
return ret
elsif Arch.s390
file_desc = Convert.convert(
SCR.Execute(path(".target.bash_output"), "echo $TERM"),
Expand Down Expand Up @@ -102,8 +90,6 @@ def FailsafeKernelParams
ret = "showopts apm=off noresume nosmp maxcpus=0 edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset"
elsif Arch.x86_64
ret = "showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset"
elsif Arch.ia64
ret = "nohalt noresume powersaved=off"
elsif Arch.s390
ret = Ops.add(DefaultKernelParams(""), " noresume")
else
Expand Down Expand Up @@ -134,13 +120,13 @@ def FailsafeKernelParams
# Is VGA parameter setting available
# @return true if vga= can be set
def VgaAvailable
Arch.i386 || Arch.x86_64 || Arch.ia64
Arch.i386 || Arch.x86_64
end

# Is Suspend to Disk available?
# @return true if STD is available
def ResumeAvailable
Arch.i386 || Arch.x86_64 || Arch.ia64 || Arch.s390
Arch.i386 || Arch.x86_64 || Arch.s390
end


Expand Down
2 changes: 1 addition & 1 deletion src/modules/Bootloader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ def CopyKernelInird
end

# check architecture for using kexec instead of reboot
if Arch.ppc || Arch.ia64 || Arch.s390
if Arch.ppc || Arch.s390
Builtins.y2milestone("Skip using of kexec on this architecture")
return true
end
Expand Down

0 comments on commit 41f9c8b

Please sign in to comment.