Anaconda-devel September 2011

anaconda-devel@lists.fedoraproject.org

24 participants
81 discussions

[f16-branch] Pull grub and efibootmgr into the package list as needed.
by Peter Jones 29 Sep '11

29 Sep '11

Instead of putting these in comps, have them be in EFIGRUB's package list. --- pyanaconda/bootloader.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index e6ac11d..87f8594 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1340,6 +1340,7 @@ class GRUB(BootLoader): class EFIGRUB(GRUB): + packages = ["grub", "efibootmgr"] can_dual_boot = False _config_dir = "efi/EFI/redhat" -- 1.7.6

1 0

[PATCH] Check the return value of get_file_list (#741466)
by Brian C. Lane 29 Sep '11

29 Sep '11

From: "Brian C. Lane" <bcl(a)redhat.com> get_file_list can return a NULL, or a NULL terminated array (which could have the NULL in the first element) so both conditions need to be checked when using the result. NOTE: Untested patch, might be suitable for f16-branch after testing --- loader/dirbrowser.c | 7 ++++--- loader/hdinstall.c | 2 +- loader/nfsinstall.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/loader/dirbrowser.c b/loader/dirbrowser.c index 18d6cdb..e4bc9d4 100644 --- a/loader/dirbrowser.c +++ b/loader/dirbrowser.c @@ -53,7 +53,8 @@ static int simpleStringCmp(const void * a, const void * b) { #define FSTEP 10 -/* Return a list of the contents of a directory, non-recursively. +/* Return a NULL terminated list of the directory contents, non-recursively. + * Return a NULL if the directory cannot be opened. * * dirname -- The directory to list. * filterfunc -- An optional function to use for filtering out the results. @@ -141,12 +142,12 @@ char * newt_select_file(char * title, char * text, char * dirname, 0, 0, 0, 1, 0, 0); newtGridSetField(grid, 0, 3, NEWT_GRID_SUBGRID, buttons, 0, 0, 0, 0, 0, NEWT_GRID_FLAG_GROWX); - + /* if this isn't our topdir, we want to let them go up a dir */ if (strcmp(topdir, dir)) newtListboxAppendEntry(listbox, "../", ".."); - for (i = 0; (files[i] != NULL); i++) { + for (i = 0; files && (files[i] != NULL); i++) { if ((files[i] == NULL) || (strlen(files[i]) == 0)) continue; path = malloc(strlen(files[i]) + strlen(dir) + 2); sprintf(path, "%s/%s", dir, files[i]); diff --git a/loader/hdinstall.c b/loader/hdinstall.c index b336690..a284869 100644 --- a/loader/hdinstall.c +++ b/loader/hdinstall.c @@ -278,7 +278,7 @@ int promptForHardDrive(struct loaderData_s *loaderData) { } files = get_file_list(buf, ends_with_iso); - if (!files) { + if (!files || !files[0] || !strlen(files[0])) { newtWinMessage(_("Error"), _("OK"), _("That directory does not contain an installable tree.")); umount("/mnt/install/isodir"); diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c index ffaa51b..d29e98a 100644 --- a/loader/nfsinstall.c +++ b/loader/nfsinstall.c @@ -190,7 +190,7 @@ static unsigned int isNfsIso(struct loaderData_s *loaderData) { } files = get_file_list("/mnt/install/isodir", ends_with_iso); - if (!files) { + if (!files || !files[0] || !strlen(files[0])) { logMessage(ERROR, "no ISO images present in /mnt/install/isodir"); goto cleanup2; } -- 1.7.6

2 1

[f16-branch 1/2] upgrade: do not insist on running the "bootloader" step.
by Ales Kozumplik 29 Sep '11

29 Sep '11

For instance, efi systems should never see that screen. Resolves: rhbz#741817 --- pyanaconda/iw/upgrade_bootloader_gui.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pyanaconda/iw/upgrade_bootloader_gui.py b/pyanaconda/iw/upgrade_bootloader_gui.py index 7ffee12..39f82bb 100644 --- a/pyanaconda/iw/upgrade_bootloader_gui.py +++ b/pyanaconda/iw/upgrade_bootloader_gui.py @@ -44,7 +44,7 @@ class UpgradeBootloaderWindow (InstallWindow): self.dispatch.skip_steps("instbootloader") self.anaconda.bootloader.skip_bootloader = True else: - self.dispatch.request_steps("bootloader") + self.dispatch.request_steps_gently("bootloader") self.anaconda.bootloader.skip_bootloader = False def getScreen(self, anaconda): -- 1.7.6

2 2

[f16-branch] reset bootloader.stage1_device upon repeated autopartitioning.
by Ales Kozumplik 29 Sep '11

29 Sep '11

Otherwise the algorithm doesn't see it as necessary to create a biosboot partition. Resolves: rhbz#741587 --- pyanaconda/storage/partitioning.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pyanaconda/storage/partitioning.py b/pyanaconda/storage/partitioning.py index 537b38f..9e3a5f2 100644 --- a/pyanaconda/storage/partitioning.py +++ b/pyanaconda/storage/partitioning.py @@ -251,6 +251,7 @@ def doAutoPartition(anaconda): # whole disk format replaced by a disklabel. Make sure to keep any # previous boot order selection from clearpart_gui or kickstart anaconda.bootloader.clear_drive_list() + anaconda.bootloader.stage1_device = None disks = _getCandidateDisks(anaconda.storage) devs = _schedulePVs(anaconda.storage, disks) @@ -981,7 +982,7 @@ def doPartitioning(storage, bootloader=None): updateExtendedPartitions(storage, disks) - # make sure the stage1_device gets updated + # make sure the stage1_device gets updated during sanityCheck if storage.anaconda: storage.anaconda.bootloader.stage1_device = None -- 1.7.6

1 0

[master] dracut args: "rhgb quiet" should come last.
by Ales Kozumplik 29 Sep '11

29 Sep '11

The patch introduces a simple mechanism to order the (otherwise unsorted) dracut arguments. With a UT. Resolves: rhbz#740949 --- pyanaconda/bootloader.py | 12 +++++++++++- tests/pyanaconda_test/bootloader_test.py | 8 ++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index 45950d7..210ea15 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -79,6 +79,11 @@ class BootLoaderError(Exception): pass class Arguments(set): + ordering_dict = { + "rhgb" : 99, + "quiet" : 100 + } + def _merge_ip(self): """ Find ip= arguments targetting the same interface and merge them. @@ -111,7 +116,12 @@ class Arguments(set): def __str__(self): self._merge_ip() - return " ".join(self) + # sort the elements according to their values in ordering_dict. The + # higher the number the closer to the final string the argument + # gets. The default is 50. + lst = sorted(self, key=lambda s: self.ordering_dict.get(s, 50)) + + return " ".join(lst) class BootLoaderImage(object): """ Base class for bootloader images. Suitable for non-linux OS images. """ diff --git a/tests/pyanaconda_test/bootloader_test.py b/tests/pyanaconda_test/bootloader_test.py index 59b6ea2..6aa93bb 100644 --- a/tests/pyanaconda_test/bootloader_test.py +++ b/tests/pyanaconda_test/bootloader_test.py @@ -49,3 +49,11 @@ class ArgumentsTest(mock.TestCase): self.assertEqual(str(a), "ip=eth0:dhcp") a = Arguments(["ip=eth0:dhcp", "ip=eth0:auto6"]) assert(str(a) in ["ip=eth0:auto6,dhcp", "ip=eth0:dhcp,auto6"]) + + def test_sorting(self): + from pyanaconda.bootloader import Arguments + a = Arguments(["ip=eth0:dhcp", "rhgb", "quiet", + "root=/dev/mapper/destroyers-rubies", "rd.md=0", + "rd.luks=0"]) + # 'rhgb quiet' should be the final entries: + assert(str(a).endswith("rhgb quiet")) -- 1.7.6

2 1

[PATCH] Fix the path for splash.xpm.gz in grub.conf
by Peter Jones 28 Sep '11

28 Sep '11

It's always in /boot/grub/splash.xpm.gz because that's where the package puts it. It's not always in the config dir. --- pyanaconda/bootloader.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index adef315..26009f0 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1159,14 +1159,14 @@ class GRUB(BootLoader): self.write_config_console(config) if not flags.serial: - splash = "splash.xpm.gz" + splash = "grub/splash.xpm.gz" splash_path = os.path.normpath("%s%s/%s" % (install_root, - self.config_dir, + self.boot_prefix, splash)) if os.access(splash_path, os.R_OK): grub_root_grub_name = self.grub_device_name(self.stage2_device) config.write("splashimage=%s/%s/%s\n" % (grub_root_grub_name, - self.grub_config_dir, + self.boot_prefix, splash)) config.write("hiddenmenu\n") -- 1.7.6

3 3

[PATCH f16-branch] Write the grub.conf after setting up the new EFI bootloader (#741994))
by Brian C. Lane 28 Sep '11

28 Sep '11

From: "Brian C. Lane" <bcl(a)redhat.com> On EFI the grub.conf includes a device mapping line that ensures that hd(x,y) points to the right device. This information is pulled from efibootmgr -v, so the new entry needs to be made before writing grub.conf on EFI, not after. NOTE: Tested and confirmed via program.log and efibootmgr -v after install --- pyanaconda/bootloader.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index e6ce014..efbf115 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1431,6 +1431,20 @@ class EFIGRUB(GRUB): def update(self, install_root=""): self.write(install_root=install_root) + # + # installation + # + def write(self, install_root=""): + """ Write the bootloader configuration and install the bootloader. """ + if self.update_only: + self.update(install_root=install_root) + return + + sync() + self.stage2_device.format.sync(root=install_root) + self.install(install_root=install_root) + self.write_config(install_root=install_root) + class GRUB2(GRUB): """ GRUBv2 -- 1.7.6

2 1

[master] simple patch preventing traceback on DVD installations
by Vratislav Podzimek 27 Sep '11

27 Sep '11

This patch removes ROOT_PATH argument from getDefaultKeyboard() calls. This argument was removed from the definition of the method with 3e8d08cac6aa89f001c5b32dba251a62a45ed7f4. -- Vratislav Podzimek

2 2

[rhel6-branch] grub: write 'ip=eth0:dhcp, auto6' instead of 'ip=eth0:dhcp ip=eth0:auto6'
by Ales Kozumplik 26 Sep '11

26 Sep '11

Unit test included. Resolves: rhbz#740222 --- booty/bootloaderInfo.py | 32 +++++++++++++++++++++++++++++++ tests/booty_test/bootloaderInfo_test.py | 28 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) create mode 100644 tests/booty_test/bootloaderInfo_test.py diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index e3b5d34..4e1e7d3 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -86,6 +86,36 @@ def rootIsDevice(dev): class KernelArguments: + def _merge_ip(self, args): + """ + Find ip= arguments targetting the same interface and merge them. + """ + # partition the input + def partition_p(arg): + # we are only interested in ip= parameters that use some kind of + # automatic network setup: + return arg.startswith("ip=") and arg.count(":") == 1 + ip_params = filter(partition_p, args) + rest = set(filter(lambda p: not partition_p(p), args)) + # strip away 'ip=' and split at the colon: + ip_params = map(lambda p: p[3:], ip_params) + ip_params = map(lambda p: p.split(":"), ip_params) + # create mapping from nics to their configurations + config = {} + for (nic, cfg) in ip_params: + if nic in config: + config[nic].append(cfg) + else: + config[nic] = [cfg] + + # output the new parameters: + ip_params = set() + for nic in config: + ip_params.add("ip=%s:%s" % (nic, ",".join(sorted(config[nic])))) + rest.update(ip_params) + + return rest + def getDracutStorageArgs(self, devices): args = set() types = {} @@ -135,6 +165,8 @@ class KernelArguments: all_args.update(self.args) all_args.update(self.appendArgs) + all_args = self._merge_ip(all_args) + return " ".join(all_args) def set(self, args): diff --git a/tests/booty_test/bootloaderInfo_test.py b/tests/booty_test/bootloaderInfo_test.py new file mode 100644 index 0000000..fe057a8 --- /dev/null +++ b/tests/booty_test/bootloaderInfo_test.py @@ -0,0 +1,28 @@ +import mock + +class KernelArgumentsTestCase(mock.TestCase): + def setUp(self): + self.setupModules( + ['_isys', 'logging', 'anaconda_log', 'block']) + + def tearDown(self): + self.tearDownModules() + + def test_merge_ip(self): + import booty + ka = booty.KernelArguments(mock.Mock()) + + # test that _merge_ip() doesnt break the simple case: + args = set(["one", "two", "ip=eth0:dhcp"]) + self.assertEqual(ka._merge_ip(args), + set(["one", "two", "ip=eth0:dhcp"])) + + # test that it does what it's supposed to: + args = set(["one", "two", "ip=eth0:dhcp", "ip=eth0:auto6", + "ip=wlan0:dhcp", + "ip=10.34.102.102::10.34.39.255:24:aklab:eth2:none"]) + self.assertEqual(ka._merge_ip(args), set([ + "one", "two", + "ip=wlan0:dhcp", + "ip=10.34.102.102::10.34.39.255:24:aklab:eth2:none", + "ip=eth0:auto6,dhcp"])) -- 1.7.6

2 2

[f16-branch] fcoe: fix detecting FCoE NIC
by Ales Kozumplik 26 Sep '11

26 Sep '11

From: Michael Brown <mcb30(a)ipxe.org> Signed-off-by: Michael Brown <mcb30(a)ipxe.org> --- pyanaconda/storage/fcoe.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pyanaconda/storage/fcoe.py b/pyanaconda/storage/fcoe.py index 79d267b..0b30dd9 100644 --- a/pyanaconda/storage/fcoe.py +++ b/pyanaconda/storage/fcoe.py @@ -80,7 +80,7 @@ class fcoe(object): log.info("No FCoE EDD info found: %s" % rc.rstrip()) return - (key, val) = rc.split("=", 1) + (key, val) = rc.strip().split("=", 1) if val not in isys.getDeviceProperties(): log.error("Unknown FCoE NIC found in EDD: %s, ignoring" % val) return -- 1.7.6

2 1

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel September 2011