Anaconda-devel July 2011

anaconda-devel@lists.stg.fedoraproject.org

26 participants
72 discussions

[PATCH] add multiboot support for tboot
by Wei, Gang 17 Aug '11

17 Aug '11

From: Gang Wei <gang.wei(a)intel.com> If tboot package installed, create multiboot entries in GRUB config for kernels. Signed-off-by: Gang Wei <gang.wei(a)intel.com> --- pyanaconda/bootloader.py | 72 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 60 insertions(+), 12 deletions(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index 6df0107..02940f3 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -114,6 +114,25 @@ class LinuxBootLoaderImage(BootLoaderImage): filename = "initramfs-%s.img" % self.version return filename +class MultibootLinuxBootLoaderImage(LinuxBootLoaderImage): + def __init__(self, device=None, label=None, short=None, version=None, + multiboot=None, mbargs=None, args=None): + super(MultibootLinuxBootLoaderImage, self).__init__( + device=device, label=label, + short=short, version=version) + self._multiboot = multiboot # filename string + self._mbargs = mbargs + self._args = args + + @property + def multiboot(self): + return self._multiboot + + def mbargs(self): + return self._mbargs + + def args(self): + return self._args class BootLoader(object): """TODO: @@ -1123,15 +1142,30 @@ class GRUB(BootLoader): grub_root = self.grub_device_name(self.stage2_device) args.update(["ro", "root=%s" % image.device.fstabSpec]) args.update(self.boot_args) - stanza = ("title %(label)s (%(version)s)\n" - "\troot %(grub_root)s\n" - "\tkernel %(prefix)s/%(kernel)s %(args)s\n" - "\tinitrd %(prefix)s/%(initrd)s\n" - % {"label": image.label, "version": image.version, - "grub_root": grub_root, - "kernel": image.kernel, "initrd": image.initrd, - "args": args, - "prefix": self.boot_prefix}) + if isinstance(image, MultibootLinuxBootLoaderImage): + args.update(image.args) + stanza = ("title %(label)s (%(version)s)\n" + "\troot %(grub_root)s\n" + "\tkernel %(prefix)s/%(multiboot)s %(mbargs)s\n" + "\tmodule %(prefix)s/%(kernel)s %(args)s\n" + "\tmodule %(prefix)s/%(initrd)s\n" + % {"label": image.label, "version": image.version, + "grub_root": grub_root, + "multiboot": image.multiboot, + "mbargs": image.mbargs, + "kernel": image.kernel, "initrd": image.initrd, + "args": args, + "prefix": self.boot_prefix}) + else: + stanza = ("title %(label)s (%(version)s)\n" + "\troot %(grub_root)s\n" + "\tkernel %(prefix)s/%(kernel)s %(args)s\n" + "\tinitrd %(prefix)s/%(initrd)s\n" + % {"label": image.label, "version": image.version, + "grub_root": grub_root, + "kernel": image.kernel, "initrd": image.initrd, + "args": args, + "prefix": self.boot_prefix}) else: stanza = ("title %(label)s\n" "\trootnoverify %(grub_root)s\n" @@ -1905,6 +1939,11 @@ def writeSysconfigKernel(anaconda, default_kernel): f.write("DEFAULTKERNEL=%s\n" % default_kernel) f.close() +def is_trusted_boot(anaconda): + if anaconda.backend.ayum.isPackageInstalled(name="tboot"): + return True + else: + return False def writeBootloader(anaconda): """ Write bootloader configuration to disk. @@ -1971,9 +2010,18 @@ def writeBootloader(anaconda): used.append(nick) label = "%s-%s" % (base_label, nick) short = "%s-%s" % (base_short, nick) - image = LinuxBootLoaderImage(device=anaconda.storage.rootDevice, - version=version, - label=label, short=short) + if is_trusted_boot(anaconda): + image = MultibootLinuxBootLoaderImage( + device=anaconda.storage.rootDevice, + version=version, + label=label, short=short, + multiboot="tboot.gz", + mbargs=["logging=vga,serial,memory"], + args=["intel_iommu=on"]) + else: + image = LinuxBootLoaderImage(device=anaconda.storage.rootDevice, + version=version, + label=label, short=short) anaconda.bootloader.add_image(image) # write out /etc/sysconfig/kernel -- 1.7.5.1

6 17

[PATCH 1/4] We also need to catch ValueError on mock.disk.TestFile.__del__.
by Chris Lumens 04 Aug '11

04 Aug '11

--- tests/mock/disk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/mock/disk.py b/tests/mock/disk.py index 4fe4c76..3ee98aa 100644 --- a/tests/mock/disk.py +++ b/tests/mock/disk.py @@ -41,7 +41,7 @@ class DiskIO(object): def __del__(self): try: self.close() - except (AttributeError): + except (AttributeError, ValueError): pass def __enter__(self): -- 1.7.6

3 8

[PATCH rhel6-branch] Don't raise Retry dialog in loader kickstart networking (#722276)
by Radek Vykydal 04 Aug '11

04 Aug '11

From: Radek Vykydal <rvykydal(a)redhat.comuser> Instead, fail silently as in RHEL 5 and RHEL 6.0. Depending on whether the network is up, user can be asked for networking later in UI step. Offer the Retry dialog only in the UI step where it actually works (don't for early networking, when fetching ks, or in kicktart). Resolves: rhbz#722276 --- loader/net.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/loader/net.c b/loader/net.c index c303fbe..b5f4777 100644 --- a/loader/net.c +++ b/loader/net.c @@ -482,9 +482,7 @@ int readNetConfig(char * device, iface_t * iface, exit(1); } - newtWinMessage(_("Network Error"), _("Retry"), - _("There was an error configuring your network " - "interface.")); + logMessage(ERROR, "failed to configure network interface"); return LOADER_BACK; } -- 1.7.4

2 1

[kickstart] proposed patch removing duplicate checking for network commands
by Vratislav Podzimek 01 Aug '11

01 Aug '11

This is the patch mentioned in the comment of the "Create all wireless connections..." patch.

2 3

[PATCH][master][rhel6-branch] Eliminate duplicate ks lines.
by David Lehman 29 Jul '11

29 Jul '11

This is the master version of a patch to eliminate duplicate lines in anaconda-ks.cfg for encrypted block devices. The rhel6-branch version will also require a cherry-pick of 509dd717e1fcd8dd0115ed9 from master.

2 2

[PATCH 1/6] Disable E1103 (the "some types could not be inferred" message).
by Chris Lumens 29 Jul '11

29 Jul '11

We hit this for every use of a pyanaconda.product value, so it's really just noise. --- tests/pylint/pylint-false-positives | 6 ------ tests/pylint/runpylint.sh | 1 + 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/tests/pylint/pylint-false-positives b/tests/pylint/pylint-false-positives index bde04b5..97f566c 100644 --- a/tests/pylint/pylint-false-positives +++ b/tests/pylint/pylint-false-positives @@ -26,12 +26,6 @@ ^E1101:[ 0-9]*:.*: Instance of 'dict' has no 'Get' member$ ^E1101:[ 0-9]*:FilteredCallbacks\..*set: Instance of 'FilteredCallbacks' has no 'notebook' member$ ^E1101:[ 0-9]*:Anaconda\.backend: Instance of 'DefaultInstall' has no 'getBackend' member$ -^E1103:[ 0-9]*:.*: Instance of 'str' has no '.*' member $but some types could not be inferred$$ -^E1103:[ 0-9]*:execWithCapture: Instance of 'list' has no 'splitlines' member $but some types could not be inferred$$ -^E1103:[ 0-9]*:VncServer\.connectToView: Instance of 'list' has no 'startswith' member $but some types could not be inferred$$ -^E1103:[ 0-9]*:VncServer\.connectToView: Instance of 'list' has no 'endswith' member $but some types could not be inferred$$ -^E1103:[ 0-9]*:bindMountDevDirectory: Instance of 'DeviceFormat' has no 'mount' member $but some types could not be inferred$$ -^E1103:[ 0-9]*:DeviceTree.handleUdevDiskLabelFormat: Instance of 'DeviceFormat' has no 'partitions' member $but some types could not be inferred$$ ^W0404:[ 0-9]*:runRescue: Reimport 'runPostScripts' $imported line [0-9]*$$ # Note this will become a real issue when we start supporting multiple netdevs ^W0631:[ 0-9]*:Network.write: Using possibly undefined loop variable 'dev'$ diff --git a/tests/pylint/runpylint.sh b/tests/pylint/runpylint.sh index cdd5fc4..721a122 100755 --- a/tests/pylint/runpylint.sh +++ b/tests/pylint/runpylint.sh @@ -54,6 +54,7 @@ for i in pyanaconda/storage pyanaconda/installclasses/*.py pyanaconda/iw/*.py py --disable=W0511,W0403,W0703,W0622,W0614,W0401,W0142,W0613,W0621,W0141 \ --disable=W0102,W0201,W0221,W0702,W0602,W0603,W0604,W1001,W0223 \ --disable=W0231,W0232,W0233,W0404 \ + --disable=E1103 \ $NON_STRICT_OPTIONS $i | \ egrep -v "`cat $FALSE_POSITIVES | tr '\n' '|'`" > pylint-tmp-log if grep -q -v '************* Module ' pylint-tmp-log; then -- 1.7.6

2 6

[PATCH][master][rhel6-branch] followup fix for earlier patch
by David Lehman 29 Jul '11

29 Jul '11

Apparently I did not test the first patch about swap space with no UUID.

2 2

[lorax] Write the lorax verion in the .buildstamp (#689697)
by Martin Gracik 29 Jul '11

29 Jul '11

--- Makefile | 3 ++- setup.py | 15 ++++++++++++++- src/pylorax/buildstamp.py | 10 ++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 66b1b00..f1a2f84 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ all: $(PYTHON) setup.py build install: all + @echo "num = '$(VERSION)-$(RELEASE)'" > src/pylorax/version.py $(PYTHON) setup.py install --root=$(DESTDIR) clean: @@ -28,7 +29,7 @@ archive: tag local: @rm -rf $(PKGNAME)-$(VERSION).tar.bz2 - @rm -rf /tmp/$(PKGNAME)-$(VERSION) /tmp/$(PKGNAME) + @rm -rf /tmp/$(PKGNAME)-$(VERSION) @dir=$$PWD; cp -a $$dir /tmp/$(PKGNAME)-$(VERSION) @rm -rf /tmp/$(PKGNAME)-$(VERSION)/.git @dir=$$PWD; cd /tmp; tar --bzip2 -cSpf $$dir/$(PKGNAME)-$(VERSION).tar.bz2 $(PKGNAME)-$(VERSION) diff --git a/setup.py b/setup.py index e026651..5b710f0 100644 --- a/setup.py +++ b/setup.py @@ -3,6 +3,7 @@ from distutils.core import setup from glob import glob import os +import sys # config file @@ -17,8 +18,20 @@ for root, dnames, fnames in os.walk("share"): # executable data_files.append(("/usr/sbin", ["src/sbin/lorax"])) +# get the version +sys.path.insert(0, "src") +try: + import pylorax.version +except ImportError: + vernum = "devel" +else: + vernum = pylorax.version.num +finally: + sys.path = sys.path[1:] + + setup(name="lorax", - version="0.1", + version=vernum, description="Lorax", long_description="", author="Martin Gracik", diff --git a/src/pylorax/buildstamp.py b/src/pylorax/buildstamp.py index 97f0477..0c06ce5 100644 --- a/src/pylorax/buildstamp.py +++ b/src/pylorax/buildstamp.py @@ -41,6 +41,14 @@ class BuildStamp(object): self.uuid = "{0}.{1}".format(now, buildarch) def write(self): + # get lorax version + try: + import pylorax.version + except ImportError: + vernum = "devel" + else: + vernum = pylorax.version.num + logger.info("writing .buildstamp file") with open(self.path, "w") as fobj: fobj.write("[Main]\n") @@ -49,3 +57,5 @@ class BuildStamp(object): fobj.write("BugURL={0.bugurl}\n".format(self)) fobj.write("IsFinal={0.isfinal}\n".format(self)) fobj.write("UUID={0.uuid}\n".format(self)) + fobj.write("[Compose]\n") + fobj.write("Lorax={0}\n".format(vernum)) -- 1.7.3.2

2 1

Upgrade Option with kickstart
by Vijay N. Majagaonkar 28 Jul '11

28 Jul '11

Hi All, I am bit confusion in work flow of system upgrade with kickstart and it failed to upgrade the system with kickstart config file. It throw error message "No valid upgrade partition" at the time of upgrade, this error means that Installer not able to find "rootParts" I am not sure why it is failed get root parts, Can someone please help me to understand how upgrade works with kickstart config file. Just for update, I have fixed this upgrade issue in different way, I am not sure is this good way but it works for me :) [Fix] I am asking user to choose for upgrade or reinstall system, if user select the upgrade option then i am setting. if upgrade: opts.ksfile = False This will be set before creating object of a Install class, instClass = getInstClass(opts) and rest will be fine .... :) [/Fix] *This will work without an issue, But not sure is this correct way to do, Please help me to correct this* Thanks for the help V!jay.

2 2

[PATCH][master] Fix scan of already-active mdbiosraidarrays before scan of container.
by David Lehman 28 Jul '11

28 Jul '11

Related: rhbz#726306 --- pyanaconda/storage/devicetree.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pyanaconda/storage/devicetree.py b/pyanaconda/storage/devicetree.py index 5ecdc63..92bd261 100644 --- a/pyanaconda/storage/devicetree.py +++ b/pyanaconda/storage/devicetree.py @@ -856,7 +856,8 @@ class DeviceTree(object): % (parentName, container_sysfs)) return - container = self.addUdevDevice(container_info) + self.addUdevDevice(container_info) + container = self.getDeviceByName(parentName) if not container: log.error("failed to scan md container %s" % parentName) return -- 1.7.3.4

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel July 2011