Skip to content

Commit

Permalink
remove handling installation to floppy
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Sep 2, 2014
1 parent 1f5d869 commit af14f02
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 31 deletions.
17 changes: 0 additions & 17 deletions src/include/bootloader/routines/misc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -326,23 +326,6 @@ def IsPartitionBootable(device)
end
end


# Check if installation to floppy is performed
# @return true if installing bootloader to floppy
def InstallingToFloppy
ret = false
# Bug 539774 - bootloader module wants to write to floppy disk although there is none
return ret if @loader_device == nil || @loader_device == "" # bug #333459 - boot loader editor: propose new configuration
if @loader_device == StorageDevices.FloppyDevice
ret = true
elsif Builtins.contains(BootStorage.getFloppyDevices, @loader_device)
ret = true
end
Builtins.y2milestone("Installing to floppy: %1", ret)
ret
end


# Get the list of particular kernel parameters
# @param [String] line string the whole kernel command line
# @return a list of the kernel parameters split each separaterlly
Expand Down
1 change: 0 additions & 1 deletion src/modules/BootCommon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,6 @@ def Md2Partitions(md_device)
publish :function => :GetBootloaderDevice, :type => "string ()"
publish :function => :GetBootloaderDevices, :type => "list <string> ()"
publish :function => :IsPartitionBootable, :type => "boolean (string)"
publish :function => :InstallingToFloppy, :type => "boolean ()"
publish :function => :getKernelParamFromLine, :type => "string (string, string)"
publish :function => :setKernelParamToLine, :type => "string (string, string, string)"
publish :function => :myToInteger, :type => "integer (any)"
Expand Down
1 change: 0 additions & 1 deletion src/modules/BootGRUB2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ def Write
BootCommon.location_changed = true
end

#TODO: InstallingToFloppy ..
if BootCommon.location_changed
# bnc #461613 - Unable to boot after making changes to boot loader
# bnc #357290 - module rewrites grub generic code when leaving with no changes, which may corrupt grub
Expand Down
12 changes: 0 additions & 12 deletions src/modules/Bootloader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -511,12 +511,6 @@ def Write
)
return Write() if Ops.get(res, "workflow_sequence") == :next
end
else
if BootCommon.InstallingToFloppy
BootCommon.updateTimeoutPopupForFloppy(
BootCommon.getLoaderName(getLoaderType, :summary)
)
end
end

ret
Expand Down Expand Up @@ -644,12 +638,6 @@ def WriteInstallation
)
return Write() if Ops.get(res, "workflow_sequence") == :next
end
else
if BootCommon.InstallingToFloppy
BootCommon.updateTimeoutPopupForFloppy(
BootCommon.getLoaderName(getLoaderType, :summary)
)
end
end
ret
end
Expand Down

0 comments on commit af14f02

Please sign in to comment.