Anaconda-devel March 2012

anaconda-devel@lists.stg.fedoraproject.org

32 participants
106 discussions

[PATCH] Fix EFI boot prom multipath (forward port of #691794)
by Martin Sivak 02 Mar '12

02 Mar '12

--- pyanaconda/bootloader.py | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index db0626f..68c2795 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1520,22 +1520,27 @@ class EFIGRUB(GRUB): def add_efi_boot_target(self): boot_efi = self.storage.mountpoints["/boot/efi"] if boot_efi.type == "partition": - boot_disk = boot_efi.disk + boot_disks = [ boot_efi.disk ] boot_part_num = boot_efi.partedPartition.number elif boot_efi.type == "mdarray": # FIXME: I'm just guessing here. This probably needs the full # treatment, ie: multiple targets for each member. - boot_disk = boot_efi.parents[0].disk + boot_disks = [ boot_efi.parents[0].disk ] boot_part_num = boot_efi.parents[0].partedPartition.number + elif boot_efi.type == "dm-multipath": + boot_disks = [ d.disk for d in boot_efi.parents ] + boot_part_num = boot_efi.parents[0].partedPartition.number + boot_part_num = str(boot_part_num) - rc = self.efibootmgr("-c", "-w", "-L", productName, - "-d", boot_disk.path, "-p", boot_part_num, - "-l", "\\EFI\\redhat\\grub.efi", - root=ROOT_PATH, - stdout="/dev/tty5", stderr="/dev/tty5") - if rc: - raise BootLoaderError("failed to set new efi boot target") + for boot_disk in boot_disks: + rc = self.efibootmgr("-c", "-w", "-L", productName, + "-d", boot_disk.path, "-p", boot_part_num, + "-l", "\\EFI\\redhat\\grub.efi", + root=ROOT_PATH, + stdout="/dev/tty5", stderr="/dev/tty5") + if rc: + raise BootLoaderError("failed to set new efi boot target") def install(self): self.remove_efi_boot_target() -- 1.7.4.4

1 0

[PATCH] Fix EFI boot from multipath device (#691794)
by Martin Sivak 02 Mar '12

02 Mar '12

If we are booting from multipath, efibootmgr needs to be called on all constituent devices, much like RAID1 boot would be for it's mirrored /boot partitions. --- booty/bootloaderInfo.py | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index 9011886..c1486bf 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -678,13 +678,23 @@ class efiBootloaderInfo(bootloaderInfo): log.error("bootdev not found for '%s'" % (bootdisk,)) return 1 - argv = [ "efibootmgr", "-c" , "-w", "-L", - productName, "-d", "%s" % (bootdev.path,), - "-p", "%s" % (bootpart,), - "-l", "\\EFI\\redhat\\" + self.bootloader ] - rc = iutil.execWithRedirect(argv[0], argv[1:], root = instRoot, - stdout = "/dev/tty5", - stderr = "/dev/tty5") + # if the bootdev is multipath, we need to call efibootmgr on all it's + # member devices + if isinstance(bootdev, MultipathDevice): + bootdevlist = bootdev.parents + else: + bootdevlist = [bootdev] + + for d in bootdevlist: + argv = [ "efibootmgr", "-c" , "-w", "-L", + productName, "-d", "%s" % (d.path,), + "-p", "%s" % (bootpart,), + "-l", "\\EFI\\redhat\\" + self.bootloader ] + rc = iutil.execWithRedirect(argv[0], argv[1:], root = instRoot, + stdout = "/dev/tty5", + stderr = "/dev/tty5") + + # return last rc, the API doesn't provide anything better than this return rc def getEfiProductPath(self, productName, force=False): -- 1.7.4.4

1 0

[rhel6-branch] Make sure /boot is on the same disk as prepboot (#727136)
by Martin Gracik 02 Mar '12

02 Mar '12

If there is no separate /boot partition, treat the root partition as the /boot partition, because that's where /boot will end up. --- storage/partitioning.py | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/storage/partitioning.py b/storage/partitioning.py index 0484eb5..41172e2 100644 --- a/storage/partitioning.py +++ b/storage/partitioning.py @@ -28,6 +28,7 @@ import parted from pykickstart.constants import * from constants import * +import platform from errors import * from deviceaction import * @@ -996,6 +997,23 @@ def allocatePartitions(storage, disks, partitions, freespace): removeNewPartitions(disks, new_partitions) + # Search for the /boot partition. + # If there is not a separate /boot partition, + # the /boot will end up on the / partition. + # We need this later for apple's bootstrap and prepboot, + # because this partition needs to be on the same disk + # as bootstrap/prepboot partition. + # Only do this on systems that need it. + _boot_part = "/boot" + pl = platform.getPlatform(None) + if pl.weight(fstype="prepboot") or pl.weight(fstype="appleboot"): + if "/boot" not in storage.mountpoints and "/" in storage.mountpoints: + _boot_part = "/" + + #_mountpoints = [getattr(part.format, "mountpoint", "") for part in new_partitions] + #if "/boot" not in _mountpoints: + # _boot_part = "/" + for _part in new_partitions: if _part.partedPartition and _part.isExtended: # ignore new extendeds as they are implicit requests @@ -1188,7 +1206,7 @@ def allocatePartitions(storage, disks, partitions, freespace): if not mountpoint: mountpoint = "" - if free and (_part.req_bootable or mountpoint.startswith("/boot")): + if free and (_part.req_bootable or mountpoint.startswith(_boot_part)): # if this is a bootable partition we want to # use the first freespace region large enough # to satisfy the request -- 1.7.5.4

1 1

[PATCH rhel6-branch] ipoib support - write TYPE to ifcfg also for disabled devices (#660686)
by Radek Vykydal 01 Mar '12

01 Mar '12

Related: rhbz#660686 --- loader/net.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/loader/net.c b/loader/net.c index 0b0d16d..b4add2b 100644 --- a/loader/net.c +++ b/loader/net.c @@ -161,10 +161,10 @@ static void ipCallback(newtComponent co, void * dptr) { * * This can directly be written into the ifcfg script's TYPE= field. */ -static char *netArpTypeStr(iface_t *iface) +static char *netArpTypeStr(const char *ifname) { char *ret = NULL; - int arptype = iface_get_arptype(iface->device); + int arptype = iface_get_arptype(ifname); switch (arptype) { case ARPHRD_ETHER: ret = strdup("Ethernet"); @@ -1236,6 +1236,9 @@ int writeDisabledIfcfgFile(char *device) { fprintf(fp, "DEVICE=%s\n", device); fprintf(fp, "HWADDR=%s\n", iface_mac2str(device)); + char *str_type = netArpTypeStr(device); + if (str_type) fprintf(fp, "TYPE=%s\n", str_type); + free(str_type); uuid = nm_utils_uuid_generate(); fprintf(fp, "UUID=%s\n", uuid); g_free(uuid); @@ -1346,7 +1349,7 @@ int writeEnabledNetInfo(iface_t *iface) { fprintf(fp, "UUID=%s\n", uuid); g_free(uuid); fprintf(fp, "ONBOOT=yes\n"); - char *str_type = netArpTypeStr(iface); + char *str_type = netArpTypeStr(iface->device); if (str_type) fprintf(fp, "TYPE=%s\n", str_type); free(str_type); -- 1.7.4

2 1

[rhel6-branch] Make sure /boot is on the same disk as prepboot (#727136)
by Martin Gracik 01 Mar '12

01 Mar '12

If there is no separate /boot partition, treat the root partition as the /boot partition, because that's where /boot will end up. --- storage/partitioning.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/storage/partitioning.py b/storage/partitioning.py index a6a5f81..20d79af 100644 --- a/storage/partitioning.py +++ b/storage/partitioning.py @@ -991,6 +991,15 @@ def allocatePartitions(storage, disks, partitions, freespace): removeNewPartitions(disks, new_partitions) + # Search for the /boot partition. + # If there is not a separate /boot partition, + # the /boot will end up on the / partition. + # We need this later for apple's bootstrap and prepboot, + # because this partition needs to be on the same disk + # as bootstrap/prepboot partition. + _mountpoints = [getattr(part.format, "mountpoint", "") for part in new_partitions] + _boot_part = "/boot" if "/boot" in _mountpoints else "/" + for _part in new_partitions: if _part.partedPartition and _part.isExtended: # ignore new extendeds as they are implicit requests @@ -1183,7 +1192,7 @@ def allocatePartitions(storage, disks, partitions, freespace): if not mountpoint: mountpoint = "" - if free and (_part.req_bootable or mountpoint.startswith("/boot")): + if free and (_part.req_bootable or mountpoint.startswith(_boot_part)): # if this is a bootable partition we want to # use the first freespace region large enough # to satisfy the request -- 1.7.5.4

3 2

Adding hardware support
by Moray Henderson 01 Mar '12

01 Mar '12

I can add support for a JMicron(R) JMC250 PCI-E Ethernet Adapter easily enough to CentOS 5.6 by installing the kmod-jme rpm from ElRepo.org, but what's the best way of adding that driver to the install/rescue environment of Anaconda? Moray. "To err is human; to purr, feline."

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel March 2012