Skip to content

Commit

Permalink
code review improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@jreidinger
jreidinger committed May 26, 2016
1 parent 1b7ff24 commit dc2c0ad
Show file tree
Hide file tree
Showing 2 changed files with 261 additions and 245 deletions.
249 changes: 4 additions & 245 deletions src/lib/bootloader/stage1.rb
View file
Expand Up @@ -4,6 +4,7 @@
require "bootloader/udev_mapping"
require "bootloader/bootloader_factory"
require "bootloader/stage1_device"
require "bootloader/stage1_proposal"
require "cfa/grub2/install_device"

Yast.import "Arch"
Expand Down Expand Up @@ -38,6 +39,9 @@ def write
@model.save
end

# Checks if given device is used as stage1 location
# @param [String] dev device to check, it can be kernel or udev name,
# it can also be virtual or real device, method convert it as needed
def include?(dev)
kernel_dev = Bootloader::UdevMapping.to_kernel_device(dev)
real_devs = ::Bootloader::Stage1Device.new(kernel_dev).real_devices
Expand Down Expand Up @@ -219,249 +223,4 @@ def available_partitions(res)
res[:extended] = extended_partition if logical_boot?
end
end

# Represents object that can set passed stage1 to proposed values
class Stage1Proposal
include Yast::Logger

def self.propose(stage1)
proposal = case Yast::Arch.architecture
when "i386", "x86_64"
X64
when /ppc/
PPC
when /s390/
S390
else
raise "unsuported architecture #{Yast::Arch.architecture}"
end

proposal.new(stage1).propose

log.info "proposed stage1 configuratopn #{stage1.inspect}"
end

protected

attr_reader :stage1

def initialize(stage1)
@stage1 = stage1
end

# Set "boot_*" flags in the globals map according to the boot device selected
# with parameter selected_location. Only a single boot device can be selected
# with this function. The function cannot be used to set a custom boot device.
# It will always be deleted.
#
# FIXME: `mbr_md is probably unneeded; AFA we can see, this decision is
# automatic anyway and perl-Bootloader should be able to make it without help
# from the user or the proposal.
#
# @param [Symbol, Array] selected_location symbol one of :boot, :root, :mbr,
# :extended, `none or Array with first value :custom and second device for
# custom devices
def assign_bootloader_device(selected_location)
log.info "assign bootloader device '#{selected_location.inspect}'"
# first, default to all off:
stage1.clear_devices

case selected_location
when :root then stage1.add_udev_device(Yast::BootStorage.RootPartitionDevice)
when :boot then stage1.add_udev_device(Yast::BootStorage.BootPartitionDevice)
when :extended then stage1.add_udev_device(extended_partition)
when :mbr then stage1.add_udev_device(Yast::BootStorage.mbr_disk)
when :none then log.info "Resetting bootloader device"
when Array
if selected_location.first != :custom
raise "Unknown value to select bootloader device #{selected_location.inspect}"
end

stage1.model.add_device(selected_location[1]) # add directly proposed value without changes
else
raise "Unknown value to select bootloader device #{selected_location.inspect}"
end
end

# x86_64 specific stage1 proposal
class X64 < Stage1Proposal
def propose
selected_location = propose_boot_location
log.info "propose_x86 (#{selected_location})"

# set active flag, if needed
if selected_location == :mbr
# We are installing into MBR:
# If there is an active partition, then we do not need to activate
# one (otherwise we do).
# Reason: if we use our own MBR code, we do not rely on the activate
# flag in the partition table to boot Linux. Thus, the activated
# partition can remain activated, which causes less problems with
# other installed OSes like Windows (older versions assign the C:
# drive letter to the activated partition).
used_disks = ::Bootloader::Stage1Device.new(Yast::BootStorage.mbr_disk).real_devices
need_activate = used_disks.any? { |d| Yast::Storage.GetBootPartition(d).empty? }
stage1.activate = need_activate
stage1.generic_mbr = false
else
# if not installing to MBR, always activate (so the generic MBR will
# boot Linux)
stage1.activate = true
stage1.generic_mbr = true
end
end

private

def propose_boot_location
selected_location = :mbr

# there was check if boot device is on logical partition
# IMO it is good idea check MBR also in this case
# see bug #279837 comment #53
selected_location = separated_boot? ? :boot : :root if boot_partition_on_mbr_disk?

if logical_boot? && extended_partition
log.info "/boot is on logical partition and extended detected, extended proposed"
selected_location = :extended
end

# for separate btrfs partition prefer MBR (bnc#940797)
if boot_with_btrfs? && (logical_boot? || separated_boot?)
log.info "/boot is on logical partition or separated and uses btrfs, mbr is preferred"
selected_location = :mbr
end

if !stage1.can_use_boot?
log.info "/boot cannot be used to install stage1"
selected_location = :mbr
end

assign_bootloader_device(selected_location)
end

def separated_boot?
Yast::BootStorage.BootPartitionDevice != Yast::BootStorage.RootPartitionDevice
end

def extended_partition
init_boot_info unless @boot_initialized

@extended
end

def logical_boot?
init_boot_info unless @boot_initialized

@logical_boot
end

def boot_with_btrfs?
init_boot_info unless @boot_initialized

@boot_with_btrfs
end

def init_boot_info
return if @boot_initialized

@boot_initialized = true
boot_disk_map = Yast::Storage.GetTargetMap[Yast::BootStorage.disk_with_boot_partition] || {}
boot_part = Yast::Storage.GetPartition(Yast::Storage.GetTargetMap,
Yast::BootStorage.BootPartitionDevice)
@logical_boot = boot_part["type"] == :logical
@boot_with_btrfs = boot_part["used_fs"] == :btrfs

# check for sure also underlaying partitions
(boot_disk_map["partitions"] || []).each do |p|
@extended = p["device"] if p["type"] == :extended
next unless underlaying_boot_partition_devices.include?(p["device"])

@boot_with_btrfs = true if p["used_fs"] == :btrfs
@logical_boot = true if p["type"] == :logical
end
end

# determine the underlaying devices for the "/boot" partition (either the
# BootPartitionDevice, or the devices from which the soft-RAID device for
# "/boot" is built)
def underlaying_boot_partition_devices
::Bootloader::Stage1Device.new(Yast::BootStorage.BootPartitionDevice).real_devices
end

def boot_partition_on_mbr_disk?
underlaying_boot_partition_devices.any? do |dev|
pdp = Yast::Storage.GetDiskPartition(dev)
p_disk = pdp["disk"] || ""
p_disk == Yast::BootStorage.mbr_disk
end
end
end

# s390x specific stage1 proposal
class S390 < Stage1Proposal
def propose
# s390 do not need any partition as it is stored to predefined zipl location
assign_bootloader_device(:none)

stage1.activate = false
stage1.generic_mbr = false
end
end

# ppc64le specific stage1 proposal
class PPC < Stage1Proposal
def propose
partition = proposed_prep_partition
if partition
assign_bootloader_device([:custom, partition])

stage1.activate = true
stage1.generic_mbr = false
# handle diskless setup, in such case do not write boot code anywhere
# (bnc#874466)
# we need to detect what is mount on /boot and if it is nfs, then just
# skip this proposal. In other case if it is not nfs, then it is error
# and raise exception.
# powernv do not have prep partition, so we do not have any partition
# to activate (bnc#970582)
elsif Yast::BootStorage.disk_with_boot_partition == "/dev/nfs" || Yast::Arch.board_powernv
stage1.activate = false
stage1.generic_mbr = false
return
else
raise "there is no prep partition"
end
end

private

def proposed_prep_partition
partitions = Yast::BootStorage.prep_partitions

created = partitions.find do |part|
part_map = Yast::Storage.GetPartition(Yast::Storage.GetTargetMap, part)
part_map["create"] == true
end

if created
log.info "using freshly created prep partition #{created}"
return created
end

same_disk_part = partitions.find do |part|
disk = Yast::Storage.GetDiskPartition(part)["disk"]
Yast::BootStorage.disk_with_boot_partition == disk
end

if same_disk_part
log.info "using prep on boot disk #{same_disk_part}"
return same_disk_part
end

log.info "nothing better so lets return first available prep"
partitions.first
end
end
end
end

0 comments on commit dc2c0ad

Please sign in to comment.