January 2015 - anaconda-patches - Fedora mailing-lists

[PATCH rhel6-branch] Increment MD container child counter even if its volumes are ignored (#1120640)
by Artur Paszkiewicz 11 Jan '16

11 Jan '16

Volumes which are not selected in Specialized Storage Devices are ignored in addUdevDevice. This causes that their parent container won't have its child counter incremented, which can later cause an incorrect unusedRaidMembersWarning. Resolves: rhbz#1120640 Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz(a)intel.com> --- storage/devicetree.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/storage/devicetree.py b/storage/devicetree.py index 4045cdf..b9ea399 100644 --- a/storage/devicetree.py +++ b/storage/devicetree.py @@ -1328,6 +1328,13 @@ class DeviceTree(object): # slice off the "/dev/" part, lvm filter cares only about the rest partitions_paths = [p[5:] for p in partitions_paths] map(lvm.lvm_cc_addFilterRejectRegexp, partitions_paths) + + if udev_device_get_md_container(info): + parentName = devicePathToName(udev_device_get_md_container(info)) + container = self.getDeviceByName(parentName) + if container: + container.addChild() + return log.debug("scanning %s (%s)..." % (name, sysfs_path)) -- 1.8.4.5

4 14

[f21-branch][PATCH] clean up stage1 volume check, check format as well as mountpoint
by Adam Williamson 25 Feb '15

25 Feb '15

This is a follow-on from e2d10a04. To reduce the change from the previous behaviour and minimize the chance of any strange corner-case breakage, this sorts the disk list, rather than filtering it. It also now checks the format_type constraint as well as the mountpoint constraint. There are platforms (PPC) which use a volume as the stage1 target, but don't require it to be mounted; this handles those as well as platforms which require the target volume to be mounted to a specific location. It's also slightly re-arranged to flow better with the existing check that filters out protected, hidden and unusable disks. The overall behaviour change can be described as: on platforms which require the stage1 target to be a volume, use the first enumerated disk which contains a potentially valid volume as the 'boot disk' if the user does not explicitly specify one, rather than just using the first enumerated disk and failing if it does not contain a valid stage1 target volume (#1168118). This also debug logs the result of the 'disks with potential stage1 targets' check. --- pyanaconda/kickstart.py | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index d44b349..4aa4fd8 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -379,22 +379,30 @@ class Bootloader(commands.bootloader.F21_Bootloader): if self.timeout is not None: storage.bootloader.timeout = self.timeout - # try to reduce the set of possible 'boot disks' to the disks containing - # a valid stage1 mount point, if there are any, because those disks - # should be searched for a stage1_valid device - disks = storage.disks - if platform.bootStage1ConstraintDict["mountpoints"]: - disks = [p.disk for p in storage.devices if getattr(p.format, "mountpoint", None) in platform.bootStage1ConstraintDict["mountpoints"]] - if not disks: - # but if not, just go ahead and use the set of all disks or - # else we'll error out later - disks = storage.disks - # Throw out drives specified that don't exist or cannot be used (iSCSI # device on an s390 machine) - disk_names = [d.name for d in disks - if not d.format.hidden and not d.protected and - (not blivet.arch.isS390() or not isinstance(d, blivet.devices.iScsiDiskDevice))] + disks = [d for d in storage.disks + if not d.format.hidden and not d.protected and + (not blivet.arch.isS390() or not isinstance(d, blivet.devices.iScsiDiskDevice))] + if platform.bootStage1ConstraintDict["format_types"]: + # sort the list of disks with those that contain possibly-valid + # stage1 partitions first, so we'll pick a disk with one as + # bootDrive if it has not been explicitly set: RHBZ #1168118 + s1vols = [vol for vol in storage.devices if + getattr(vol.format, "type", None) in + platform.bootStage1ConstraintDict["format_types"]] + if platform.bootStage1ConstraintDict["mountpoints"]: + # further sort by volumes with valid mount points, if + # the platform requires this + s1disks = [vol.disk for vol in s1vols if + getattr(vol.format, "mountpoint", None) in + platform.bootStage1ConstraintDict["mountpoints"]] + else: + s1disks = [vol.disk for vol in s1vols] + log.debug("Disks with potentially valid stage1 volumes: %s", + ' '.join([d.name for d in s1disks])) + disks.sort(key=lambda x: x in s1disks, reverse=True) + disk_names = [d.name for d in disks] diskSet = set(disk_names) for drive in self.driveorder[:]: -- 2.1.0

3 12

[PATCH] Check parent/container type for thin volumes and normal volumes.
by David Lehman 03 Feb '15

03 Feb '15

--- blivet/devices/lvm.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py index d1817dd..1c72c86 100644 --- a/blivet/devices/lvm.py +++ b/blivet/devices/lvm.py @@ -440,6 +440,7 @@ class LVMLogicalVolumeDevice(DMDevice): _type = "lvmlv" _resizable = True _packages = ["lvm2"] + _containerClass = LVMVolumeGroupDevice def __init__(self, name, parents=None, size=None, uuid=None, copies=1, logSize=None, segType=None, @@ -480,14 +481,17 @@ class LVMLogicalVolumeDevice(DMDevice): :type percent: int """ - if self.__class__.__name__ == "LVMLogicalVolumeDevice": - if isinstance(parents, list): - if len(parents) != 1: - raise ValueError("constructor requires a single LVMVolumeGroupDevice instance") - elif not isinstance(parents[0], LVMVolumeGroupDevice): - raise ValueError("constructor requires a LVMVolumeGroupDevice instance") - elif not isinstance(parents, LVMVolumeGroupDevice): - raise ValueError("constructor requires a LVMVolumeGroupDevice instance") + if isinstance(parents, list): + if len(parents) != 1: + raise ValueError("constructor requires a single %s instance" % self._containerClass.__name__) + + container = parents[0] + else: + container = parents + + if not isinstance(container, self._containerClass): + raise ValueError("constructor requires a %s instance" % self._containerClass.__name__) + DMDevice.__init__(self, name, size=size, fmt=fmt, sysfsPath=sysfsPath, parents=parents, exists=exists) @@ -1093,6 +1097,7 @@ class LVMThinPoolDevice(LVMLogicalVolumeDevice): class LVMThinLogicalVolumeDevice(LVMLogicalVolumeDevice): """ An LVM Thin Logical Volume """ _type = "lvmthinlv" + _containerClass = LVMThinPoolDevice @property def pool(self): -- 1.9.3

2 1

[PATCH] Fix pylint complaints about log lines
by Brian C. Lane 30 Jan '15

30 Jan '15

--- dracut/parse-kickstart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index cee151a..412ac6a 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -354,7 +354,7 @@ def ksnet_to_ifcfg(net, filename=None): return if (not os.path.isdir("/sys/class/net/%s" % dev) and not net.bondslaves and not net.teamslaves and not net.bridgeslaves): - log.info("can't find device %s" % dev) + log.info("can't find device %s", dev) return ifcfg = dict() if filename is None: @@ -442,7 +442,7 @@ def ksnet_to_ifcfg(net, filename=None): } add_s390_settings(slave, slave_ifcfg) slave_filename = "/tmp/ifcfg/ifcfg-%s" % "_".join(slave_ifcfg['NAME'].split(" ")) - log.info("writing ifcfg %s for slave %s of bond %s" % (slave_filename, slave, dev)) + log.info("writing ifcfg %s for slave %s of bond %s", slave_filename, slave, dev) write_ifcfg(slave_filename, slave_ifcfg) if net.teamslaves: @@ -466,7 +466,7 @@ def ksnet_to_ifcfg(net, filename=None): slave_ifcfg['TEAM_PORT_CONFIG'] = "'" + cfg + "'" slave_filename = "/tmp/ifcfg/ifcfg-%s" % "_".join(slave_ifcfg['NAME'].split(" ")) - log.info("writing ifcfg %s for slave %s of team %s" % (slave_filename, slave, dev)) + log.info("writing ifcfg %s for slave %s of team %s", slave_filename, slave, dev) write_ifcfg(slave_filename, slave_ifcfg) if net.bridgeslaves: @@ -517,7 +517,7 @@ def ksnet_to_ifcfg(net, filename=None): ifcfg['PHYSDEV'] = dev filename = "/tmp/ifcfg/ifcfg-%s" % interface_name - log.info("writing ifcfg %s for %s" % (filename, dev)) + log.info("writing ifcfg %s for %s", filename, dev) if write_ifcfg(filename, ifcfg): return filename @@ -528,7 +528,7 @@ def write_ifcfg(filename, ifcfg): for k,v in ifcfg.items(): f.write("%s=%s\n" % (k,v)) except IOError as e: - log.error("can't write %s: %s" % (filename, e)) + log.error("can't write %s: %s", filename, e) return False return True -- 1.9.3

2 1

[PATCH] Add JENKINS_PROXY support to makebumpver
by Brian C. Lane 30 Jan '15

30 Jan '15

Somtimes the build system isn't on the same network. Add JENKINS_PROXY to the .rhbzauth file and point it to a proxy that is. Also catch connection errors and report them as a failure. --- scripts/makebumpver | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/scripts/makebumpver b/scripts/makebumpver index 488287b..c1483c9 100755 --- a/scripts/makebumpver +++ b/scripts/makebumpver @@ -45,6 +45,7 @@ class MakeBumpVer: self.bzserver = 'bugzilla.redhat.com' self.bzurl = "https://%s/xmlrpc.cgi" % self.bzserver self.jenkins = None + self.jenkins_proxy = None self.username = None self.password = None self.bz = None @@ -63,6 +64,8 @@ class MakeBumpVer: self.password = line[14:].strip('"\'') elif line.startswith('JENKINS='): self.jenkins = line[8:].strip('"\'') + elif line.startswith('JENKINS_PROXY='): + self.jenkins_proxy = line[14:].strip('"\'') self.gituser = self._gitConfig('user.name') self.gitemail = self._gitConfig('user.email') @@ -460,25 +463,34 @@ class MakeBumpVer: ret = False - with closing(urllib.urlopen(self.jenkins)) as f: - contents = f.readlines() + if self.jenkins_proxy: + proxies = { "http": self.jenkins_proxy } + else: + proxies = {} - try: - j = json.loads(contents[0]) - except (TypeError, ValueError): - pass - else: - # Get the name of the job we should be looking for in jenkins. - # This name is composed from the name of the project, plus the - # branch of the project without any "-branch" stuff at the end. - targetJob = self.name + "-" + self.git_branch - if targetJob.endswith("-branch"): - targetJob = targetJob[:-7] - - for job in j["jobs"]: - if job["name"] == targetJob: - ret = job["color"] == "blue" - break + try: + with closing(urllib.urlopen(self.jenkins, proxies=proxies)) as f: + contents = f.readlines() + + try: + j = json.loads(contents[0]) + except (TypeError, ValueError): + pass + else: + # Get the name of the job we should be looking for in jenkins. + # This name is composed from the name of the project, plus the + # branch of the project without any "-branch" stuff at the end. + targetJob = self.name + "-" + self.git_branch + if targetJob.endswith("-branch"): + targetJob = targetJob[:-7] + + for job in j["jobs"]: + if job["name"] == targetJob: + ret = job["color"] == "blue" + break + except IOError as e: + log.error("Jenkins check failed: %s", e) + return False return ret -- 1.9.3

2 1

[master][py3][PATCH] Replace xrange() with range()
by Vratislav Podzimek 30 Jan '15

30 Jan '15

xrange() doesn't exist in Python3 where range() works the same way as xrange in Python2. Using range() in Python2 doesn't bring any significant overhead to installation. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- dracut/driver-updates | 4 ++-- pyanaconda/ui/gui/utils.py | 2 +- scripts/anaconda-yum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dracut/driver-updates b/dracut/driver-updates index acd5cd3..7554b4e 100755 --- a/dracut/driver-updates +++ b/dracut/driver-updates @@ -313,7 +313,7 @@ def fake_drivers(num): """ Generate a number of fake drivers for testing """ drivers = [] - for i in xrange(0, num): + for i in range(0, num): d = Driver() d.source = "driver-%d" % i d.flags = "modules" @@ -476,7 +476,7 @@ def selection_menu(items, title, info_func, multi_choice=True, refresh=False): num_items = page_length else: num_items = len(items) % page_length - for i in xrange(0, num_items): + for i in range(0, num_items): item_idx = ((page-1) * page_length) + i if multi_choice: if items[item_idx].selected: diff --git a/pyanaconda/ui/gui/utils.py b/pyanaconda/ui/gui/utils.py index 0e3c50c..775b6d7 100644 --- a/pyanaconda/ui/gui/utils.py +++ b/pyanaconda/ui/gui/utils.py @@ -176,7 +176,7 @@ def gtk_batch_map(action, items, args=(), pre_func=None, batch_size=1): # process as many batches as user shouldn't notice while tstamp - tstamp_start < NOTICEABLE_FREEZE: - for _i in xrange(batch_size): + for _i in range(batch_size): try: action_item = queue.get_nowait() if action_item is TERMINATOR: diff --git a/scripts/anaconda-yum b/scripts/anaconda-yum index 9c6dce1..82d7203 100755 --- a/scripts/anaconda-yum +++ b/scripts/anaconda-yum @@ -127,7 +127,7 @@ def run_yum_transaction(release, arch, yum_conf, install_root, ts_file, script_l print("INFO: populate transaction set") xdelay = xprogressive_delay() - for retry_count in xrange(0, MAX_DOWNLOAD_RETRIES+1): + for retry_count in range(0, MAX_DOWNLOAD_RETRIES+1): # retry count == 0 -> first attempt # retry count > 0 -> retry if retry_count: @@ -292,7 +292,7 @@ class RPMCallback(object): exception_message = "" xdelay = xprogressive_delay() - for retry_count in xrange(0, MAX_DOWNLOAD_RETRIES+1): + for retry_count in range(0, MAX_DOWNLOAD_RETRIES+1): # retry count == 0 -> first attempt # retry count > 0 -> retry if retry_count and retry_message: -- 2.1.0

2 1

[rhel6-branch] Support lvm thinp via custom kickstart only
by David Lehman 30 Jan '15

30 Jan '15

This does not include support for autopart or any interactive installation involving thinp.

3 7

[PATCH 1/2] Pass multiple args to runone in run_kickstart_tests.sh
by Brian C. Lane 30 Jan '15

30 Jan '15

Only quote the args, not the command, so that they get passed to livemedia-creator as one group. Use eval so that bash doesn't eat the kittens. --- tests/kickstart_tests/run_kickstart_tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/kickstart_tests/run_kickstart_tests.sh b/tests/kickstart_tests/run_kickstart_tests.sh index 9fbf67f..e977b4a 100755 --- a/tests/kickstart_tests/run_kickstart_tests.sh +++ b/tests/kickstart_tests/run_kickstart_tests.sh @@ -84,10 +84,10 @@ runone() { kargs=$(kernel_args) if [[ ${kargs} != "" ]]; then - kargs="--kernel-args ${kargs}" + kargs="--kernel-args \"$kargs\"" fi - livemedia-creator ${kargs} \ + eval livemedia-creator ${kargs} \ --make-disk \ --iso "${IMAGE}" \ --ks ${ksfile} \ -- 1.9.3

3 4

[PATCH] Don't process continue-clicked events for windows that aren't shown.
by Chris Lumens 29 Jan '15

29 Jan '15

This is another tactic in trying to fix the frequent kickstart problem of processing a continue-clicked event twice: once when the summary hub is up, and then very shortly after when the progress hub is up. This fix will ignore any events where the window we should be operating on is not the one that is currently displayed. --- pyanaconda/ui/gui/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index 3927353..b775a54 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -746,7 +746,7 @@ class GraphicalUserInterface(UserInterface): ### SIGNAL HANDLING METHODS ### def _on_continue_clicked(self, win, user_data=None): - if not win.get_may_continue(): + if not win.get_may_continue() or win != self._currentAction.window: return # If we're on the last screen, clicking Continue quits. -- 2.2.1

2 1

[PATCH] Add back an empty %files for the anaconda metapackage
by David Shea 29 Jan '15

29 Jan '15

This is the difference between creating an empty package and creating no package. Thanks, rpm. --- anaconda.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/anaconda.spec.in b/anaconda.spec.in index 4159654..62f57c2 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -259,6 +259,8 @@ update-desktop-database &> /dev/null || : update-desktop-database &> /dev/null || : %endif +%files + %files core -f %{name}.lang %license COPYING %{_unitdir}/* -- 2.1.0

2 1

[PATCH] Do not include dd_list and dd_extract in the anaconda-core package.
by Chris Lumens 29 Jan '15

29 Jan '15

This results in file conflicts with anaconda-dracut. --- anaconda.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/anaconda.spec.in b/anaconda.spec.in index ad89e44..0800cd9 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -267,6 +267,7 @@ update-desktop-database &> /dev/null || : %{_sbindir}/handle-sshpw %{_datadir}/anaconda %{_prefix}/libexec/anaconda +%exclude %{_prefix}/libexec/anaconda/dd_* %{_libdir}/python*/site-packages/pyanaconda/* %exclude %{_libdir}/python*/site-packages/pyanaconda/rescue.py* %exclude %{_libdir}/python*/site-packages/pyanaconda/text.py* -- 2.2.1

2 1

[anaconda][master][PATCH 0/9] More Python 3 compatibility
by Martin Kolman 29 Jan '15

29 Jan '15

Most of the easy to change, non-invasive Python 3 compatibility changes have been done a while ago. This patch set contains more complicated and invasive changes, but still without breaking Python 2 support. Also while working on the patch set I've made a preliminary list of the *invasive* changes that *do* break Python 2 compatibility, but are needed to make Anaconda Python 3 compatible: - switch to Python 3 versions of dependencies in spec file - switch to use python3 in the main anaconda script: - #!/usr/bin/python3 - replace types.StringType with str or bytes (depending on data being processed) - replace types.UnicodeType with str - replace all unicode() calls with str() - import Queue -> import queue - import ConfigParser -> import configparser - remove from __future__ import print_function - adapt metaclass usage - 2to3 -f metaclass . - replace xrange with range - replace next() with __next__() for custom iterators - replace raw_input() with input() These two together + dropping of the few remaining Python 2-only dependencies (pyblock, something else ?) should more or less give us a Python 3 Anaconda. Martin Kolman (9): Make the iter*() dictionary methods Python 3 compatible (#1014220) Replace StandardError with Exception (#1014220) Make filter() usage Python 3 compatible (#1014220) Replace urllib with python-requests for network access (#1014220) Make map() usage Python 3 compatible (#1014220) Do not use sys.exc_type (#1014220) Replace long usage with int (#1014220) Replace callable with collections.Callable (#1014220) Make range usage Python 3 compatible (#1014220) pyanaconda/addons.py | 6 +-- pyanaconda/anaconda.py | 2 +- pyanaconda/anaconda_argparse.py | 6 +-- pyanaconda/bootloader.py | 4 +- pyanaconda/geoloc.py | 66 +++++++++++++++--------------- pyanaconda/installclass.py | 4 +- pyanaconda/iutil.py | 4 +- pyanaconda/keyboard.py | 6 ++- pyanaconda/kickstart.py | 6 +-- pyanaconda/localization.py | 2 +- pyanaconda/network.py | 3 +- pyanaconda/packaging/dnfpayload.py | 4 +- pyanaconda/packaging/livepayload.py | 11 +++-- pyanaconda/rescue.py | 2 +- pyanaconda/threads.py | 2 +- pyanaconda/ui/__init__.py | 4 +- pyanaconda/ui/gui/__init__.py | 2 +- pyanaconda/ui/gui/hubs/__init__.py | 2 +- pyanaconda/ui/gui/spokes/custom.py | 6 +-- pyanaconda/ui/gui/spokes/datetime_spoke.py | 2 +- pyanaconda/ui/gui/spokes/filter.py | 4 +- pyanaconda/ui/gui/spokes/lib/resize.py | 2 +- pyanaconda/ui/gui/spokes/source.py | 2 +- pyanaconda/ui/gui/spokes/storage.py | 7 ++-- pyanaconda/ui/gui/xkl_wrapper.py | 4 +- pyanaconda/ui/tui/hubs/__init__.py | 4 +- pyanaconda/ui/tui/spokes/__init__.py | 5 ++- pyanaconda/ui/tui/spokes/time_spoke.py | 3 +- pyanaconda/users.py | 5 +-- scripts/makeupdates | 2 +- tests/pyanaconda_tests/ks_version_test.py | 4 +- tests/pyanaconda_tests/timezone_test.py | 4 +- 32 files changed, 96 insertions(+), 94 deletions(-) -- 2.1.0

4 26

[master] Remove unused version macros from anaconda.spec.in
by Vratislav Podzimek 29 Jan '15

29 Jan '15

They could only lead to confusion. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- anaconda.spec.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index 6427025..60fec06 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -26,12 +26,10 @@ Source0: %{name}-%{version}.tar.bz2 %define dnfver 0.4.18 %define partedver 1.8.1 %define pypartedver 2.5-2 -%define pythonpyblockver 0.45 %define nmver 0.9.9.0-10.git20130906 %define dbusver 1.2.3 %define yumutilsver 1.1.11-3 %define mehver 0.23-1 -%define sckeyboardver 1.3.1 %define firewalldver 0.3.5-1 %define utillinuxver 2.15.1 %define dracutver 034-7 -- 2.1.0

2 1

[PATCH] Don't allow weak LUKS passwords either
by Brian C. Lane 29 Jan '15

29 Jan '15

Be consistent about password strength, make sure LUKS also passes the minimum libpwquality requirements. --- pyanaconda/ui/gui/spokes/lib/passphrase.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.py b/pyanaconda/ui/gui/spokes/lib/passphrase.py index 89c2c64..8241ce1 100644 --- a/pyanaconda/ui/gui/spokes/lib/passphrase.py +++ b/pyanaconda/ui/gui/spokes/lib/passphrase.py @@ -146,7 +146,8 @@ class PassphraseDialog(GUIObject, GUIInputCheckHandler): # The save button should only be sensitive if the match check passes if self._passphrase_match_check.check_status == InputCheck.CHECK_OK and \ - self._confirm_match_check.check_status == InputCheck.CHECK_OK: + self._confirm_match_check.check_status == InputCheck.CHECK_OK and \ + self._strength_check.check_status == InputCheck.CHECK_OK: self._save_button.set_sensitive(True) else: self._save_button.set_sensitive(False) -- 1.9.3

2 1

[anaconda] Use %license in anaconda.spec.in
by Brian C. Lane 28 Jan '15

28 Jan '15

https://fedoraproject.org/wiki/Packaging:LicensingGuidelines#License_Text --- anaconda.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index 6427025..f510109 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -259,10 +259,10 @@ update-desktop-database &> /dev/null || : %endif %files -%doc COPYING +%license COPYING %files core -f %{name}.lang -%doc COPYING +%license COPYING %{_unitdir}/* %{_prefix}/lib/systemd/system-generators/* %{_bindir}/instperf -- 1.9.3

2 5

[anaconda/blivet][master] Move installation specific code to anaconda's codebase
by Vratislav Podzimek 28 Jan '15

28 Jan '15

These four patches move installation specific code from blivet to anaconda. Being used only as part of the installation process such code doesn't belong to blivet's codebase. The GH Blivet issue [0] suggests moving also shouldClear and clearPartitions, but clearPartitions is used by blivet's tests to initialize loop devices for running tests and shouldClear is used by clearPartitions and getFreeSpace. It would be possible to pass shouldClear-type-of-function as a parameter to clearPartitions and getFreeSpace with a default value of None meaning nothing (or everything?) should be cleared, but I'm leaving that for future patch set. [0] https://github.com/rhinstaller/blivet/issues/25 This is the first step, the other two are dealing with shouldClear as mentioned above and cleaning up the new code in pyanaconda/autopart.py and storage_utils.py so that it better matches coding style etc. Although it is quite a big number of added/changed lines, it's mainly just a copy-paste from blivet sources with fixed imports and Blivet's _sysroot replaced by iutil.getSysroot(). I ran several autopart installations and everything seems to be okay. Vratislav Podzimek (2): Move autopart and swap suggesting functionality to anaconda Move code related to finding existing installations to anaconda anaconda | 4 +- pyanaconda/autopart.py | 497 ++++++++++++++++++++++++++++++++ pyanaconda/installclass.py | 4 +- pyanaconda/kickstart.py | 10 +- pyanaconda/rescue.py | 6 +- pyanaconda/storage_utils.py | 218 ++++++++++++++ pyanaconda/ui/gui/spokes/custom.py | 4 +- pyanaconda/ui/gui/spokes/lib/refresh.py | 5 +- pyanaconda/ui/gui/spokes/storage.py | 6 +- pyanaconda/ui/tui/spokes/storage.py | 3 +- 10 files changed, 738 insertions(+), 19 deletions(-) create mode 100644 pyanaconda/autopart.py -- 2.1.0

2 10

[PATCH 1/4] Increase minimum password length to 8
by Brian C. Lane 27 Jan '15

27 Jan '15

In order to promote a more secure default installation increse the password length needed for root and user passwords in the GUI. --- pyanaconda/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/constants.py b/pyanaconda/constants.py index 1aa7f9d..0bd23d3 100644 --- a/pyanaconda/constants.py +++ b/pyanaconda/constants.py @@ -134,7 +134,7 @@ FIRSTBOOT_ENVIRON = "firstboot" UNSUPPORTED_HW = 1 << 28 # Password validation -PASSWORD_MIN_LEN = 6 +PASSWORD_MIN_LEN = 8 PASSWORD_EMPTY_ERROR = N_("The password is empty.") PASSWORD_CONFIRM_ERROR_GUI = N_("The passwords do not match.") PASSWORD_CONFIRM_ERROR_TUI = N_("The passwords you entered were different. Please try again.") -- 1.9.3

4 9

[blivet][rhel7-branch,master] revert problematic commit
by David Lehman 27 Jan '15

27 Jan '15

The commit being reverted was not critical to resolving the bug it was related to. I should have known to leave it out for that reason. The conditions necessary for the new (see bug referenced in commit msg) problem to manifest are not totally clear to me. I am hoping to refactor the devicetree populate method as part of the uevent handling work, and this kind of tangle is exactly what I'll be hoping to get a grip on, if not eliminate.

2 2

[blivet][master/rhel7-branch][PATCH] Shrink the last of the biggest implicit partitions if needed (#1171116)
by Vratislav Podzimek 27 Jan '15

27 Jan '15

If there is a big partition requested to be allocated on a disk with basically the same size (e.g. 1.8 GiB swap on a 2 GiB DASD with BTRFS autopart) we need to make one of the implicit partitions smaller (they default to 500 MiB) to fit into the disk. We choose the last of the biggest ones because the biggest ones have the biggest chance to "survive" shrinking and last of them won't collide with /boot being on the same disk (there's one implicit partition per disk so the first one will likely end up on the same disk as /boot when doing autopart). Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- blivet/partitioning.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/blivet/partitioning.py b/blivet/partitioning.py index 9f6eea8..ff744cf 100644 --- a/blivet/partitioning.py +++ b/blivet/partitioning.py @@ -130,6 +130,7 @@ def _schedulePartitions(storage, disks, implicit_devices, min_luks_entropy=0): :returns: None :rtype: None """ + # basis for requests with requiredSpace is the sum of the sizes of the # two largest free regions all_free = (Size(reg.getLength(unit="B")) for reg in getFreeRegions(disks)) @@ -238,10 +239,16 @@ def _schedulePartitions(storage, disks, implicit_devices, min_luks_entropy=0): if storage.autoPartType in (AUTOPART_TYPE_LVM, AUTOPART_TYPE_LVM_THINP, AUTOPART_TYPE_BTRFS): - # doing LVM/BTRFS -- make sure the newly created partition fits in some - # free space together with one of the implicitly requested partitions - smallest_implicit = sorted(implicit_devices, key=lambda d: d.size)[0] - if (request.size + smallest_implicit.size) > all_free[0]: + # doing LVM/BTRFS -- make sure the newly created partition fits in + # some free space together with one of the implicitly requested + # partitions (the last of the biggest ones because the biggest ones + # have the biggest chance to "survive" shrinking and last of them + # won't collide with /boot being on the same disk) + # HINT: sorted().reverse() is different from sorted(reverse=True) + sorted_implicits = sorted(implicit_devices, key=lambda d: d.size) + sorted_implicits.reverse() + biggest_last_implicit = sorted_implicits[0] + if (request.size + biggest_last_implicit.size) > all_free[0]: # not enough space to allocate the smallest implicit partition # and the request, make the implicit partition smaller with # fixed size in order to make space for the request @@ -253,10 +260,10 @@ def _schedulePartitions(storage, disks, implicit_devices, min_luks_entropy=0): all_free.sort(reverse=True) if new_size > Size(0): - smallest_implicit.size = new_size + biggest_last_implicit.size = new_size / 2 else: - implicit_devices.remove(smallest_implicit) - storage.destroyDevice(smallest_implicit) + implicit_devices.remove(biggest_last_implicit) + storage.destroyDevice(biggest_last_implicit) return implicit_devices -- 2.1.0

3 6

[PATCH rhel7-branch] network: add teamd package if team is used during installation (#1185670)
by Radek Vykydal 26 Jan '15

26 Jan '15

Resolves: rhbz#1185670 --- pyanaconda/install.py | 3 +++ pyanaconda/network.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pyanaconda/install.py b/pyanaconda/install.py index 51c42b9..d1ed6bb 100644 --- a/pyanaconda/install.py +++ b/pyanaconda/install.py @@ -213,6 +213,9 @@ def doInstall(storage, payload, ksdata, instClass): if not ksdata.bootloader.disabled: packages += storage.bootloader.packages + if network.is_using_team_device: + packages.append("teamd") + # don't try to install packages from the install class' ignored list and the # explicitly excluded ones (user takes the responsibility) packages = [p for p in packages diff --git a/pyanaconda/network.py b/pyanaconda/network.py index f86b0c2..7a74b90 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -1371,3 +1371,6 @@ def status_message(): def default_ks_vlan_interface_name(parent, vlanid): return "%s.%s" % (parent, vlanid) + +def is_using_team_device(): + return any(nm.nm_device_type_is_team(d) for d in nm.nm_devices()) -- 1.9.3

2 1

[PATCH] Check whether a payload has an instclass (#1185588)
by David Shea 26 Jan '15

26 Jan '15

The instclass is set when the payload is setup, so don't crash on unsetup payloads. --- pyanaconda/ui/gui/spokes/software.py | 2 +- pyanaconda/ui/tui/spokes/software.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py index 2721ef9..5006e4c 100644 --- a/pyanaconda/ui/gui/spokes/software.py +++ b/pyanaconda/ui/gui/spokes/software.py @@ -280,7 +280,7 @@ class SoftwareSelectionSpoke(NormalSpoke): # If no environment is selected, use the default from the instclass. # If nothing is set in the instclass, the first environment will be # selected below. - if not self.environment: + if not self.environment and self.payload.instclass: self.environment = self.payload.instclass.defaultPackageEnvironment firstEnvironment = True diff --git a/pyanaconda/ui/tui/spokes/software.py b/pyanaconda/ui/tui/spokes/software.py index 0c375c9..7657648 100644 --- a/pyanaconda/ui/tui/spokes/software.py +++ b/pyanaconda/ui/tui/spokes/software.py @@ -75,7 +75,7 @@ class SoftwareSpoke(NormalTUISpoke): environments = self.payload.environments instclass = self.payload.instclass - if instclass.defaultPackageEnvironment and \ + if instclass and instclass.defaultPackageEnvironment and \ instclass.defaultPackageEnvironment in environments: self._selection = environments.index(instclass.defaultPackageEnvironment) else: -- 2.1.0

2 1

[PATCH] initramfs regeneration, again
by David Shea 26 Jan '15

26 Jan '15

Turns out some people really do want to reuse /boot. Fine. Do the thing with the rpm database instead. I think there were some cases discussed in IRC that this wouldn't cover, but I think they involved what to do if someone reused a /boot that contained the same kernel versions as were being installed, and I don't really care a whole lot what such a person ends up with. David Shea (1): Use the rpm database to find packages installed by package payloads pyanaconda/packaging/__init__.py | 19 +++++++++++++++++++ pyanaconda/packaging/dnfpayload.py | 7 ------- pyanaconda/packaging/yumpayload.py | 8 -------- 3 files changed, 19 insertions(+), 15 deletions(-) -- 2.1.0

3 4

[blivet][rhel7][PATCH] More fixes for alignment-related partition allocation failures.
by David Lehman 26 Jan '15

26 Jan '15

Commit dcfd06a7cdb7b9 caused an UnboundLocalError, which this fixes. Also, handle alignment-related failures when no growable requests are being allocated. Related: rhbz#1167292 --- blivet/partitioning.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/blivet/partitioning.py b/blivet/partitioning.py index f33d78d..3f0f15d 100644 --- a/blivet/partitioning.py +++ b/blivet/partitioning.py @@ -1122,6 +1122,7 @@ def allocatePartitions(storage, disks, partitions, freespace): continue + temp_part = None try: temp_part = addPartition(disklabel, _free, @@ -1164,7 +1165,8 @@ def allocatePartitions(storage, disks, partitions, freespace): sectorsToSize(disk_growth, disk_sector_size)) - disklabel.partedDisk.removePartition(temp_part) + if temp_part: + disklabel.partedDisk.removePartition(temp_part) _part.partedPartition = None _part.disk = None @@ -1230,8 +1232,12 @@ def allocatePartitions(storage, disks, partitions, freespace): raise PartitioningError(_("not enough free space after " "creating extended partition")) - partition = addPartition(disklabel, free, part_type, _part.req_size, - _part.req_start_sector, _part.req_end_sector) + try: + partition = addPartition(disklabel, free, part_type, _part.req_size, + _part.req_start_sector, _part.req_end_sector) + except ArithmeticError: + raise PartitioningError(_("failed to allocate aligned partition")) + log.debug("created partition %s of %s and added it to %s", partition.getDeviceNodeName(), Size(partition.getLength(unit="B")), -- 1.9.3

3 2

[blivet][master] Use list comprehension instead of filter+lambda in makebumpver
by Vratislav Podzimek 26 Jan '15

26 Jan '15

From: Anne Mulhern <amulhern(a)redhat.com> Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- scripts/makebumpver | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/makebumpver b/scripts/makebumpver index 07ce065..40ad7ee 100755 --- a/scripts/makebumpver +++ b/scripts/makebumpver @@ -239,10 +239,8 @@ class MakeBumpVer: x.find('Merge branch') != 41, proc[0].strip('\n').split('\n')) - if self.ignore and self.ignore != '': - startswith_commit = lambda x: not x.startswith(commit) - for commit in self.ignore.split(','): - lines = filter(startswith_commit, lines) + ignore_commits = self.ignore.split(',') + lines = [l for l in lines if not any(l.startswith(c) for c in ignore_commits)] rpm_log = [] bad_bump = False -- 2.1.0

2 1

[anaconda][rhel7][PATCH] Show empty VGs in the custom spoke.
by David Lehman 26 Jan '15

26 Jan '15

Related: rhbz#1167292 --- pyanaconda/ui/gui/spokes/custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index b2e6d11..eb34b9a 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -936,7 +936,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): def unusedDevices(self): unused_devices = [d for d in self.__storage.unusedDevices if d.disks and d.mediaPresent and - not d.partitioned and d.direct] + not d.partitioned and (d.direct or d.isleaf)] # add incomplete VGs and MDs incomplete = [d for d in self.__storage.devicetree._devices if not getattr(d, "complete", True)] -- 1.9.3

3 2

[blivet][master] Get rid of the has_lvm function
by Vratislav Podzimek 26 Jan '15

26 Jan '15

It's only used in the tests and since blivet requires lvm tools to be installed I doubt any (user) code uses it. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- blivet/devicelibs/lvm.py | 8 -------- tests/devicelibs_test/lvm_test.py | 9 --------- 2 files changed, 17 deletions(-) diff --git a/blivet/devicelibs/lvm.py b/blivet/devicelibs/lvm.py index 7e2dbef..290e64d 100644 --- a/blivet/devicelibs/lvm.py +++ b/blivet/devicelibs/lvm.py @@ -50,14 +50,6 @@ ThPoolProfile = namedtuple("ThPoolProfile", ["name", "desc"]) KNOWN_THPOOL_PROFILES = (ThPoolProfile("thin-generic", N_("Generic")), ThPoolProfile("thin-performance", N_("Performance"))) -def has_lvm(): - if util.find_program_in_path("lvm"): - for line in open("/proc/devices").readlines(): - if "device-mapper" in line.split(): - return True - - return False - # Start config_args handling code # # Theoretically we can handle all that can be handled with the LVM --config diff --git a/tests/devicelibs_test/lvm_test.py b/tests/devicelibs_test/lvm_test.py index 8f776b2..d88c451 100755 --- a/tests/devicelibs_test/lvm_test.py +++ b/tests/devicelibs_test/lvm_test.py @@ -254,15 +254,6 @@ class LVMAsRootTestCase(LVMAsRootTestCaseBase): self.assertEqual(lvm.lvs(vg_name="wrong-vg-name"), {}) ## - ## has_lvm - ## - # pass - self.assertEqual(lvm.has_lvm(), True) - - # fail - # TODO - - ## ## lvremove ## # pass -- 2.1.0

3 5

[anaconda][master][v2][PATCH] Replace urlgrabber usage by python-requests
by Martin Kolman 23 Jan '15

23 Jan '15

Changes from v1: * pass stream=True, to requests so that the file is not downloaded to memory first (oops!) * call flush() on the file object so that it does not swamp the cache too much * log the start and end of the image download operation Martin Kolman (1): Replace python-urlgrabber with python-requests (#1141242) anaconda.spec.in | 5 ++- pyanaconda/kickstart.py | 13 ++++--- pyanaconda/packaging/__init__.py | 36 ++++++++++---------- pyanaconda/packaging/livepayload.py | 67 ++++++++++++++++++++----------------- 4 files changed, 65 insertions(+), 56 deletions(-) -- 2.1.0

2 2

[blivet][master] pylint-inspired fixes
by Vratislav Podzimek 23 Jan '15

23 Jan '15

These things were reported by pylint when I tried to clean everything up before starting to port blivet to libblockdev. One issue still remains: ************* Module blivet/formats/fs.py blivet/formats/fs.py:1499: [W0201(attribute-defined-outside-init), NoDevFS._setDevice] Attribute '_device' defined outside __init__ but I don't want to create a conflict with mulhern's patches for the NoDevFS class. Vratislav Podzimek (3): Disable pylint check for cached LVM data in more places Define the _device attribute in constructor Do not create lambda over and over in a cycle blivet/devicetree.py | 4 ++-- blivet/formats/fs.py | 4 ++++ scripts/makebumpver | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) -- 2.1.0

3 10

[PATCH 1/2] Double quote when printing error results from a kickstart test.
by Chris Lumens 23 Jan '15

23 Jan '15

I made life hard on myself and put asterisks in the output, so I need to double quote everything here to prevent a file listing on the host from getting printed out. --- tests/kickstart_tests/basic-ostree.sh | 2 +- tests/kickstart_tests/groups-and-envs-1.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/kickstart_tests/basic-ostree.sh b/tests/kickstart_tests/basic-ostree.sh index b6fab5b..0416f4f 100755 --- a/tests/kickstart_tests/basic-ostree.sh +++ b/tests/kickstart_tests/basic-ostree.sh @@ -55,7 +55,7 @@ validate() { echo '*** /root/RESULT does not exist in VM image.' elif [[ "${result}" != "SUCCESS" ]]; then status=1 - echo ${result} + echo "${result}" fi return ${status} diff --git a/tests/kickstart_tests/groups-and-envs-1.sh b/tests/kickstart_tests/groups-and-envs-1.sh index ebbc9f7..e8fef0a 100755 --- a/tests/kickstart_tests/groups-and-envs-1.sh +++ b/tests/kickstart_tests/groups-and-envs-1.sh @@ -48,7 +48,7 @@ validate() { echo '*** /root/RESULT does not exist in VM image.' elif [[ "${result}" != "SUCCESS" ]]; then status=1 - echo ${result} + echo "${result}" fi return ${status} -- 2.2.1

3 5

[blivet][master] drop useless entries from formatByDefault exceptlist
by Adam Williamson 23 Jan '15

23 Jan '15

These will never match, as the 'exceptlist' is only used to except devices whose mountpoint starts with one of the 'formatlist' entries, and / is not in 'formatlist'. --- blivet/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blivet/__init__.py b/blivet/__init__.py index 88809fb..691e45c 100644 --- a/blivet/__init__.py +++ b/blivet/__init__.py @@ -1369,7 +1369,7 @@ class Blivet(object): def formatByDefault(self, device): """Return whether the device should be reformatted by default.""" formatlist = ['/boot', '/var', '/tmp', '/usr'] - exceptlist = ['/home', '/usr/local', '/opt', '/var/www'] + exceptlist = ['/usr/local', '/var/www'] if not device.format.linuxNative: return False -- 2.2.1

2 2

[master] Strip lvm WARNING: lines from output (#1157864)
by Brian C. Lane 23 Jan '15

23 Jan '15

LVM has started including a pile of WARNING: lines in its output. These need to be removed before the return value lvm() is used. --- blivet/devicelibs/lvm.py | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/blivet/devicelibs/lvm.py b/blivet/devicelibs/lvm.py index 09a4956..c521248 100644 --- a/blivet/devicelibs/lvm.py +++ b/blivet/devicelibs/lvm.py @@ -216,13 +216,22 @@ def is_valid_thin_pool_chunk_size(size, discard=False): else: return (size % LVM_THINP_MIN_CHUNK_SIZE == 0) +def strip_lvm_warnings(buf): + """ Strip out lines starting with WARNING: + + :param str buf: A string returned from lvm + :returns: A list of strings + :rtype: list + """ + return [l for l in buf.splitlines() if l and not l.strip().startswith("WARNING:")] + def lvm(args, capture=False, ignore_errors=False): """ Runs lvm with specified arguments. :param bool capture: if True, return the output of the command. :param bool ignore_errors: if True, do not raise LVMError on failure - :returns: the output of the command or None - :rtype: str or NoneType + :returns: list of strings from the output of the command or None + :rtype: list or NoneType :raises: LVMError if command fails """ argv = ["lvm"] + args + _getConfigArgs(args) @@ -230,7 +239,7 @@ def lvm(args, capture=False, ignore_errors=False): if ret and not ignore_errors: raise LVMError("running "+ " ".join(argv) + " failed") if capture: - return out + return strip_lvm_warnings(out) def pvcreate(device): # we force dataalignment=1024k since we cannot get lvm to tell us what @@ -324,9 +333,9 @@ def pvinfo(device=None): if device: args.append(device) - buf = lvm(args, capture=True, ignore_errors=True) + lines = lvm(args, capture=True, ignore_errors=True) pvs = {} - for line in buf.splitlines(): + for line in lines: info = parse_lvm_vars(line) if len(info.keys()) != 11: log.warning("ignoring pvs output line: %s", line) @@ -421,8 +430,12 @@ def vginfo(vg_name): "-o", "uuid,size,free,extent_size,extent_count,free_count,pv_count", vg_name] - buf = lvm(args, capture=True, ignore_errors=True) - info = parse_lvm_vars(buf) + lines = lvm(args, capture=True, ignore_errors=True) + try: + info = parse_lvm_vars(lines[0]) + except IndexError: + info = {} + if len(info.keys()) != 7: raise LVMError(_("vginfo failed for %s") % vg_name) @@ -444,9 +457,9 @@ def lvs(vg_name=None): if vg_name: args.append(vg_name) - buf = lvm(args, capture=True, ignore_errors=True) + lines = lvm(args, capture=True, ignore_errors=True) logvols = {} - for line in buf.splitlines(): + for line in lines: info = parse_lvm_vars(line) if len(info.keys()) != 6: log.debug("ignoring lvs output line: %s", line) @@ -461,10 +474,9 @@ def lvorigin(vg_name, lv_name): args = ["lvs", "--noheadings", "-o", "origin"] + \ ["%s/%s" % (vg_name, lv_name)] - buf = lvm(args, capture=True, ignore_errors=True) - + lines = lvm(args, capture=True, ignore_errors=True) try: - origin = buf.splitlines()[0].strip() + origin = lines[0].strip() except IndexError: origin = '' @@ -608,10 +620,9 @@ def thinlvpoolname(vg_name, lv_name): args = ["lvs", "--noheadings", "-o", "pool_lv"] + \ ["%s/%s" % (vg_name, lv_name)] - buf = lvm(args, capture=True, ignore_errors=True) - + lines = lvm(args, capture=True, ignore_errors=True) try: - pool = buf.splitlines()[0].strip() + pool = lines[0].strip() except IndexError: pool = '' -- 1.9.3

4 20

[anaconda][master][PATCH] Replace urlgrabber usage by python-requests
by Martin Kolman 23 Jan '15

23 Jan '15

Replace the Python 2-only urlgrabber with the Python 3 compatible (and much nicer ;-) ) python-requests library. The requests API maps quite nicely to the stuff we did with urlgrabber and should have the same end result & behavior as before. The only potential mismatch I've found I found is in SSL certificate verification, the urlgrabber API has two options - ssl_verify_host and ssl_verify_peer, while request just have a single verify option. We used to set both options always to True or to False with urlgrabber, so unless requests are skipping some verification urlgrabber did, so this should be probably fine. Certificate validation itself seem to work fine as far as I can tell - connections to server with valid certificates work fine and servers with self-signed certificates raise an exception. Martin Kolman (1): Replace python-urlgrabber with python-requests (#1141242) anaconda.spec.in | 5 ++- pyanaconda/kickstart.py | 13 +++++--- pyanaconda/packaging/__init__.py | 36 ++++++++++----------- pyanaconda/packaging/livepayload.py | 64 ++++++++++++++++++++----------------- 4 files changed, 63 insertions(+), 55 deletions(-) -- 2.1.0

3 3

[PATCH 1/2] Revert "Restrict payload kernel versions to kernels in the payload (#1074358)"
by David Shea 22 Jan '15

22 Jan '15

This reverts commit 850063aa6a19f87a6ffd6009e00f15c3418d1111. This idea turned out to have some issues, such as not handling kernel-core or kernel-debug packages. --- pyanaconda/bootloader.py | 7 +----- pyanaconda/packaging/__init__.py | 44 +++++++++++++++++++++++++++++-------- pyanaconda/packaging/dnfpayload.py | 7 ------ pyanaconda/packaging/livepayload.py | 34 ---------------------------- pyanaconda/packaging/tarpayload.py | 8 +++---- pyanaconda/packaging/yumpayload.py | 8 ------- 6 files changed, 39 insertions(+), 69 deletions(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index b017265..ac9ac5c 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -27,7 +27,6 @@ import re import struct import blivet from parted import PARTITION_BIOS_GRUB -from glob import glob from pyanaconda import iutil from blivet.devicelibs import raid @@ -2388,11 +2387,7 @@ def writeBootLoader(storage, payload, instClass, ksdata): return # get a list of installed kernel packages - # add whatever rescue kernels we can find to the end - kernel_versions = list(payload.kernelVersionList) - kernel_versions += glob(iutil.getSysroot() + "/boot/vmlinuz-*-rescue-*") - kernel_versions += glob(iutil.getSysroot() + "/boot/efi/EFI/%s/vmlinuz-*-rescue-*" % instClass.efi_dir) - + kernel_versions = payload.kernelVersionList + payload.rescueKernelList if not kernel_versions: log.warning("no kernel was installed -- boot loader config unchanged") return diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 2438b6f..64985ac 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -72,15 +72,8 @@ from pyanaconda.product import productName, productVersion import urlgrabber urlgrabber.grabber.default_grabber.opts.user_agent = "%s (anaconda)/%s" %(productName, productVersion) -from distutils.version import LooseVersion - REPO_NOT_SET = False -def versionCmp(v1, v2): - """ Compare two version number strings. """ - - return LooseVersion(v1).__cmp__(LooseVersion(v2)) - ### ### ERROR HANDLING ### @@ -135,6 +128,8 @@ class Payload(object): self.data = data self.storage = None self.instclass = None + self._kernelVersionList = [] + self._rescueVersionList = [] self.txID = None def setup(self, storage, instClass): @@ -307,6 +302,29 @@ class Payload(object): self.data.packages.excludedGroupList.append(grp) ### + ### METHODS FOR WORKING WITH PACKAGES + ### + def _updateKernelVersionList(self): + try: + import yum + except ImportError: + cmpfunc = cmp + else: + cmpfunc = yum.rpmUtils.miscutils.compareVerOnly + + files = glob(iutil.getSysroot() + "/boot/vmlinuz-*") + files.extend(glob(iutil.getSysroot() + "/boot/efi/EFI/%s/vmlinuz-*" % self.instclass.efi_dir)) + + versions = sorted((f.split("/")[-1][8:] for f in files if os.path.isfile(f)), cmp=cmpfunc) + log.debug("kernel versions: %s", versions) + + # Store regular and rescue kernels separately + self._kernelVersionList = ( + [v for v in versions if "-rescue-" not in v], + [v for v in versions if "-rescue-" in v] + ) + + ### ### METHODS FOR QUERYING STATE ### @property @@ -316,8 +334,16 @@ class Payload(object): @property def kernelVersionList(self): - """ An iterable of the kernel versions installed by the payload. """ - raise NotImplementedError() + if not self._kernelVersionList: + self._updateKernelVersionList() + + return self._kernelVersionList[0] + + @property + def rescueKernelList(self): + # do re-scan if looking for rescue kernel + self._updateKernelVersionList() + return self._kernelVersionList[1] ## ## METHODS FOR TREE VERIFICATION diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py index 6cea430..0fd3ac3 100644 --- a/pyanaconda/packaging/dnfpayload.py +++ b/pyanaconda/packaging/dnfpayload.py @@ -820,10 +820,3 @@ class DNFPayload(packaging.PackagePayload): log.error(e) super(DNFPayload, self).postInstall() - - @property - def kernelVersionList(self): - return ('%s-%s.%s' % (p.version, p.release, p.arch) for p in - sorted(self._base.sack.query().filter(name='kernel'), - cmp=dnf.rpm.miscutils.compareEVR, - key=lambda p: (p.epoch, p.version, p.release))) diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py index 615bb61..17c1bac 100644 --- a/pyanaconda/packaging/livepayload.py +++ b/pyanaconda/packaging/livepayload.py @@ -56,7 +56,6 @@ from blivet.size import Size import blivet.util from pyanaconda.threads import threadMgr, AnacondaThread from pyanaconda.i18n import _ -from pyanaconda.packaging import versionCmp class LiveImagePayload(ImagePayload): """ A LivePayload copies the source image onto the target system. """ @@ -68,8 +67,6 @@ class LiveImagePayload(ImagePayload): self.pct_lock = None self.source_size = 1 - self._kernelVersionList = [] - def setup(self, storage, instClass): super(LiveImagePayload, self).setup(storage, instClass) @@ -83,9 +80,6 @@ class LiveImagePayload(ImagePayload): if rc != 0: raise PayloadInstallError("Failed to mount the install tree") - # Grab the kernel version list now so it's available after umount - self._updateKernelVersionList() - source = iutil.eintr_retry_call(os.statvfs, INSTALL_TREE) self.source_size = source.f_frsize * (source.f_blocks - source.f_bfree) @@ -186,17 +180,6 @@ class LiveImagePayload(ImagePayload): def spaceRequired(self): return Size(iutil.getDirSize("/")*1024) - def _updateKernelVersionList(self): - files = glob.glob(INSTALL_TREE + "/boot/vmlinuz-*") - files.extend(glob.glob(INSTALL_TREE + "/boot/efi/EFI/%s/vmlinuz-*" % self.instclass.efi_dir)) - - self._kernelVersionList = sorted((f.split("/")[-1][8:] for f in files - if os.path.isfile(f) and "-rescue-" not in f), cmp=versionCmp) - - @property - def kernelVersionList(self): - return self._kernelVersionList - class URLGrabberProgress(object): """ Provide methods for urlgrabber progress.""" def start(self, filename, url, basename, size, text): @@ -405,7 +388,6 @@ class LiveImageKSPayload(LiveImagePayload): # Nothing more to mount if not os.path.exists(INSTALL_TREE+"/LiveOS"): - self._updateKernelVersionList() return # Mount the first .img in the directory on INSTALL_TREE @@ -433,8 +415,6 @@ class LiveImageKSPayload(LiveImagePayload): if errorHandler.cb(exn) == ERROR_RAISE: raise exn - self._updateKernelVersionList() - source = iutil.eintr_retry_call(os.statvfs, INSTALL_TREE) self.source_size = source.f_frsize * (source.f_blocks - source.f_bfree) @@ -513,17 +493,3 @@ class LiveImageKSPayload(LiveImagePayload): return Size(self._min_size) else: return Size(1024*1024*1024) - - @property - def kernelVersionList(self): - # If it doesn't look like a tarfile use the super's kernelVersionList - if not self.is_tarfile: - return super(LiveImageKSPayload, self).kernelVersionList - - import tarfile - with tarfile.open(self.image_path) as archive: - names = archive.getnames() - - # Strip out vmlinuz- from the names - return sorted((n.split("/")[-1][8:] for n in names if "boot/vmlinuz-" in n), - cmp=versionCmp) diff --git a/pyanaconda/packaging/tarpayload.py b/pyanaconda/packaging/tarpayload.py index 805515d..b6328e0 100644 --- a/pyanaconda/packaging/tarpayload.py +++ b/pyanaconda/packaging/tarpayload.py @@ -36,7 +36,7 @@ except ImportError: log.error("import of tarfile failed") tarfile = None -from pyanaconda.packaging import ArchivePayload, PayloadError, versionCmp +from pyanaconda.packaging import ArchivePayload, PayloadError from pyanaconda import iutil # TarPayload is not yet fully implemented @@ -73,10 +73,8 @@ class TarPayload(ArchivePayload): @property def kernelVersionList(self): names = self.archive.getnames() - - # Strip out vmlinuz- from the names - return sorted((n.split("/")[-1][8:] for n in names if "boot/vmlinuz-" in n), - cmp=versionCmp) + kernels = [n for n in names if "boot/vmlinuz-" in n] + return kernels def install(self): try: diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 73caa49..742edad 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -988,14 +988,6 @@ reposdir=%s else: return environment.groups - @property - def kernelVersionList(self): - with _yum_lock: - return ("%s-%s.%s" % (p.version, p.release, p.arch) for p in - sorted(self._yum.pkgSack.searchNames(['kernel']), - cmp=yum.rpmUtils.miscutils.compareEVR, - key=lambda p: (p.epoch, p.version, p.release))) - ### ### METHODS FOR WORKING WITH GROUPS ### -- 2.1.0

3 7

[rhel6-branch] Add new freebl libraries (#1182595)
by Brian C. Lane 22 Jan '15

22 Jan '15

Resolves: rhbz#1182595 --- scripts/upd-instroot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 68d7088..464ee33 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -294,6 +294,8 @@ $LIBDIR/dbus-1 $LIBDIR/libaio.so* $LIBDIR/libfreebl3.so $LIBDIR/libfreebl3.chk +$LIBDIR/libfreeblpriv3.chk +$LIBDIR/libfreeblpriv3.so $LIBDIR/libmultipath.so* $LIBDIR/libnss_dns* $LIBDIR/libnss_files* @@ -520,6 +522,8 @@ usr/$LIBDIR/libiscsi.so* usr/$LIBDIR/libbsd.so* usr/$LIBDIR/libfreebl3.so usr/$LIBDIR/libfreebl3.chk +usr/$LIBDIR/libfreeblpriv3.chk +usr/$LIBDIR/libfreeblpriv3.so usr/$LIBDIR/libmetacity-private.so* usr/$LIBDIR/libsgutils2.so* usr/$LIBDIR/libsoftokn3.so -- 1.9.3

2 1

[master] Remove the unused indexed_dict module
by Vratislav Podzimek 22 Jan '15

22 Jan '15

Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- old_tests/pyanaconda_test/indexed_dict_test.py | 49 -------------------------- pyanaconda/indexed_dict.py | 46 ------------------------ 2 files changed, 95 deletions(-) delete mode 100644 old_tests/pyanaconda_test/indexed_dict_test.py delete mode 100644 pyanaconda/indexed_dict.py diff --git a/old_tests/pyanaconda_test/indexed_dict_test.py b/old_tests/pyanaconda_test/indexed_dict_test.py deleted file mode 100644 index 14185b6..0000000 --- a/old_tests/pyanaconda_test/indexed_dict_test.py +++ /dev/null @@ -1,49 +0,0 @@ -import mock - -class IndexedDictTest(mock.TestCase): - def setUp(self): - self.setupModules(['_isys']) - - def tearDown(self): - self.tearDownModules() - - def instantiation_test(self): - from pyanaconda.indexed_dict import IndexedDict - d = IndexedDict() - self.assertIsInstance(d, IndexedDict) - - def append_test(self): - from pyanaconda.indexed_dict import IndexedDict - d = IndexedDict() - stored_data = [1, 2, 3] - d["some_step"] = stored_data - self.assertIs(d["some_step"], stored_data) - - def cant_append_test(self): - from pyanaconda.indexed_dict import IndexedDict - def assign_int(indexed_dict): - indexed_dict[3] = [1, 2, 3] - d = IndexedDict() - self.assertRaises(TypeError, d.__setitem__, 3, [1, 2, 3]) - - def referencing_test(self): - from pyanaconda.indexed_dict import IndexedDict - d = IndexedDict() - d["first"] = 10 - d["second"] = 20 - d["third"] = 30 - self.assertEqual(d[0], 10) - self.assertEqual(d[1], 20) - self.assertEqual(d[2], 30) - self.assertRaises(IndexError, d.__getitem__, 3) - - def index_test(self): - from pyanaconda.indexed_dict import IndexedDict - d = IndexedDict() - d["first"] = 10 - d["second"] = 20 - d["third"] = 30 - - self.assertEqual(d.index("first"), 0) - self.assertEqual(d.index("second"), 1) - self.assertEqual(d.index("third"), 2) diff --git a/pyanaconda/indexed_dict.py b/pyanaconda/indexed_dict.py deleted file mode 100644 index eb5050c..0000000 --- a/pyanaconda/indexed_dict.py +++ /dev/null @@ -1,46 +0,0 @@ -# indexed_dict.py -# Implements IndexedDictionary class. -# -# Copyright (C) 2009 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions of -# the GNU General Public License v.2, or (at your option) any later version. -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY expressed or implied, including the implied warranties of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. You should have received a copy of the -# GNU General Public License along with this program; if not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the -# source code or documentation are not subject to the GNU General Public -# License and may only be used or replicated with the express permission of -# Red Hat, Inc. -# - -class IndexedDict(dict): - """ Indexed dictionary that remembers order of the inserted elements. - - Values can be inserted with string keys only, but referenced by both - string keys or index. - - There's a unit test for the class, please maintain it along. - """ - def __init__(self): - super(IndexedDict, self).__init__() - self._indexes = [] - - def __getitem__(self, key): - if type(key) is int: - key = self._indexes[key] - return super(IndexedDict, self).__getitem__(key) - - def __setitem__(self, key, value): - if type(key) is int: - raise TypeError("IndexedDict only accepts strings as new keys") - assert(len(self) == len(self._indexes)) - self._indexes.append(key) - return super(IndexedDict, self).__setitem__(key, value) - - def index(self, string_key): - return self._indexes.index(string_key) -- 2.1.0

2 1

[rhel6-branch] Some s390x patches, take 02
by Samantha N. Bueno 21 Jan '15

21 Jan '15

Applied suggestions and whatnot.

2 6

[master] Fix issues with early exceptions in threads
by Vratislav Podzimek 21 Jan '15

21 Jan '15

Properly handling early exceptions from non-main threads is quite a pain. These three patches make it a bit more straightforward and, what's even better, working. Vratislav Podzimek (3): Move HW errors processing to the code that runs in the main thread Add a method for waiting for error handling to finish Use threadMgr to wait for exception handling to finish pyanaconda/exception.py | 149 +++++++++++++++++++++--------------------- pyanaconda/threads.py | 11 ++++ pyanaconda/ui/gui/__init__.py | 6 +- 3 files changed, 89 insertions(+), 77 deletions(-) -- 2.1.0

3 7

[PATCH] Restrict payload kernel versions to kernels in the payload (#1074358)
by David Shea 21 Jan '15

21 Jan '15

Remove the generic implementation of kernelVersionList from Payload. Instead, have each payload return an iterable of the kernels that were actually in the payload. Add a method to the packaging module to handle version comparisons in the non-package payload types. Remove rescueKernelList, since the bootloader was the only thing to use this, so the bootloader can look for resuce kernels on its own. --- pyanaconda/bootloader.py | 7 +++++- pyanaconda/packaging/__init__.py | 44 ++++++++----------------------------- pyanaconda/packaging/dnfpayload.py | 7 ++++++ pyanaconda/packaging/livepayload.py | 36 ++++++++++++++++++++++++++++++ pyanaconda/packaging/tarpayload.py | 8 +++++-- pyanaconda/packaging/yumpayload.py | 8 +++++++ 6 files changed, 72 insertions(+), 38 deletions(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index ac9ac5c..b017265 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -27,6 +27,7 @@ import re import struct import blivet from parted import PARTITION_BIOS_GRUB +from glob import glob from pyanaconda import iutil from blivet.devicelibs import raid @@ -2387,7 +2388,11 @@ def writeBootLoader(storage, payload, instClass, ksdata): return # get a list of installed kernel packages - kernel_versions = payload.kernelVersionList + payload.rescueKernelList + # add whatever rescue kernels we can find to the end + kernel_versions = list(payload.kernelVersionList) + kernel_versions += glob(iutil.getSysroot() + "/boot/vmlinuz-*-rescue-*") + kernel_versions += glob(iutil.getSysroot() + "/boot/efi/EFI/%s/vmlinuz-*-rescue-*" % instClass.efi_dir) + if not kernel_versions: log.warning("no kernel was installed -- boot loader config unchanged") return diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 64985ac..42fe959 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -72,8 +72,15 @@ from pyanaconda.product import productName, productVersion import urlgrabber urlgrabber.grabber.default_grabber.opts.user_agent = "%s (anaconda)/%s" %(productName, productVersion) +from distutils.version import LooseVersion + REPO_NOT_SET = False +def versionCmp(v1, v2): + """ Compare two version number strings. """ + + return LooseVersion(v1).__cmp__(LooseVersion(v2)) + ### ### ERROR HANDLING ### @@ -128,8 +135,6 @@ class Payload(object): self.data = data self.storage = None self.instclass = None - self._kernelVersionList = [] - self._rescueVersionList = [] self.txID = None def setup(self, storage, instClass): @@ -302,29 +307,6 @@ class Payload(object): self.data.packages.excludedGroupList.append(grp) ### - ### METHODS FOR WORKING WITH PACKAGES - ### - def _updateKernelVersionList(self): - try: - import yum - except ImportError: - cmpfunc = cmp - else: - cmpfunc = yum.rpmUtils.miscutils.compareVerOnly - - files = glob(iutil.getSysroot() + "/boot/vmlinuz-*") - files.extend(glob(iutil.getSysroot() + "/boot/efi/EFI/%s/vmlinuz-*" % self.instclass.efi_dir)) - - versions = sorted((f.split("/")[-1][8:] for f in files if os.path.isfile(f)), cmp=cmpfunc) - log.debug("kernel versions: %s", versions) - - # Store regular and rescue kernels separately - self._kernelVersionList = ( - [v for v in versions if "-rescue-" not in v], - [v for v in versions if "-rescue-" in v] - ) - - ### ### METHODS FOR QUERYING STATE ### @property @@ -334,16 +316,8 @@ class Payload(object): @property def kernelVersionList(self): - if not self._kernelVersionList: - self._updateKernelVersionList() - - return self._kernelVersionList[0] - - @property - def rescueKernelList(self): - # do re-scan if looking for rescue kernel - self._updateKernelVersionList() - return self._kernelVersionList[1] + """ An iterator of the kernel versions installed by the payload. """ + raise NotImplementedError() ## ## METHODS FOR TREE VERIFICATION diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py index d0eb90e..d3c481b 100644 --- a/pyanaconda/packaging/dnfpayload.py +++ b/pyanaconda/packaging/dnfpayload.py @@ -818,3 +818,10 @@ class DNFPayload(packaging.PackagePayload): log.error(e) super(DNFPayload, self).postInstall() + + @property + def kernelVersionList(self): + return ('%s-%s.%s' % (p.version, p.release, p.arch) for p in + sorted(self._base.sack.query().filter(name='kernel'), + cmp=dnf.rpm.miscutils.compareEVR, + key=lambda p: (p.epoch, p.version, p.release))) diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py index 17c1bac..1dac9c7 100644 --- a/pyanaconda/packaging/livepayload.py +++ b/pyanaconda/packaging/livepayload.py @@ -56,6 +56,7 @@ from blivet.size import Size import blivet.util from pyanaconda.threads import threadMgr, AnacondaThread from pyanaconda.i18n import _ +from pyanaconda.packaging import versionCmp class LiveImagePayload(ImagePayload): """ A LivePayload copies the source image onto the target system. """ @@ -67,6 +68,8 @@ class LiveImagePayload(ImagePayload): self.pct_lock = None self.source_size = 1 + self._kernelVersionList = [] + def setup(self, storage, instClass): super(LiveImagePayload, self).setup(storage, instClass) @@ -80,6 +83,9 @@ class LiveImagePayload(ImagePayload): if rc != 0: raise PayloadInstallError("Failed to mount the install tree") + # Grab the kernel version list now so it's available after umount + self._updateKernelVersionList() + source = iutil.eintr_retry_call(os.statvfs, INSTALL_TREE) self.source_size = source.f_frsize * (source.f_blocks - source.f_bfree) @@ -180,6 +186,17 @@ class LiveImagePayload(ImagePayload): def spaceRequired(self): return Size(iutil.getDirSize("/")*1024) + def _updateKernelVersionList(self): + files = glob.glob(INSTALL_TREE + "/boot/vmlinuz-*") + files.extend(glob.glob(INSTALL_TREE + "/boot/efi/EFI/%s/vmlinuz-*" % self.instclass.efi_dir)) + + self._kernelVersionList = sorted([f.split("/")[-1][8:] for f in files + if os.path.isfile(f) and "-rescue-" not in f], cmp=versionCmp) + + @property + def kernelVersionList(self): + return self._kernelVersionList + class URLGrabberProgress(object): """ Provide methods for urlgrabber progress.""" def start(self, filename, url, basename, size, text): @@ -388,6 +405,7 @@ class LiveImageKSPayload(LiveImagePayload): # Nothing more to mount if not os.path.exists(INSTALL_TREE+"/LiveOS"): + self._updateKernelVersionList() return # Mount the first .img in the directory on INSTALL_TREE @@ -415,6 +433,8 @@ class LiveImageKSPayload(LiveImagePayload): if errorHandler.cb(exn) == ERROR_RAISE: raise exn + self._updateKernelVersionList() + source = iutil.eintr_retry_call(os.statvfs, INSTALL_TREE) self.source_size = source.f_frsize * (source.f_blocks - source.f_bfree) @@ -493,3 +513,19 @@ class LiveImageKSPayload(LiveImagePayload): return Size(self._min_size) else: return Size(1024*1024*1024) + + @property + def kernelVersionList(self): + # If it doesn't look like a tarfile use the super's kernelVersionList + if not self.is_tarfile: + return super(LiveImageKSPayload, self).kernelVersionList + + import tarfile + with tarfile.open(self.image_path) as archive: + names = archive.getnames() + + # Strip out vmlinuz- from the names + kernels = [n.split("/")[-1][8:] for n in names if "boot/vmlinuz-" in n] + kernels.sort(cmp=versionCmp) + + return kernels diff --git a/pyanaconda/packaging/tarpayload.py b/pyanaconda/packaging/tarpayload.py index b6328e0..3082530 100644 --- a/pyanaconda/packaging/tarpayload.py +++ b/pyanaconda/packaging/tarpayload.py @@ -36,7 +36,7 @@ except ImportError: log.error("import of tarfile failed") tarfile = None -from pyanaconda.packaging import ArchivePayload, PayloadError +from pyanaconda.packaging import ArchivePayload, PayloadError, versionCmp from pyanaconda import iutil # TarPayload is not yet fully implemented @@ -73,7 +73,11 @@ class TarPayload(ArchivePayload): @property def kernelVersionList(self): names = self.archive.getnames() - kernels = [n for n in names if "boot/vmlinuz-" in n] + + # Strip out vmlinuz- from the names + kernels = [n.split("/")[-1][8:] for n in names if "boot/vmlinuz-" in n] + kernels.sort(cmp=versionCmp) + return kernels def install(self): diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 742edad..73caa49 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -988,6 +988,14 @@ reposdir=%s else: return environment.groups + @property + def kernelVersionList(self): + with _yum_lock: + return ("%s-%s.%s" % (p.version, p.release, p.arch) for p in + sorted(self._yum.pkgSack.searchNames(['kernel']), + cmp=yum.rpmUtils.miscutils.compareEVR, + key=lambda p: (p.epoch, p.version, p.release))) + ### ### METHODS FOR WORKING WITH GROUPS ### -- 2.1.0

3 5

[PATCH] Fix install issue when many LUNs and LUN paths present.
by Robert Marshall 21 Jan '15

21 Jan '15

If installing a system with over 250 LUN paths the blivet subsystem would crash with an error. Partnered with David Lehman and he was able to provide a solution. Resolves rhbz#1181336 --- blivet/udev.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blivet/udev.py b/blivet/udev.py index 65652bd..c23ce7e 100644 --- a/blivet/udev.py +++ b/blivet/udev.py @@ -577,7 +577,7 @@ def device_is_biosraid_member(info): return False def device_get_dm_partition_disk(info): - return re.sub(r'p?\d*$', '', device_get_name(info)) + return os.path.basename(os.path.dirname(device_get_sysfs_path(info))) def device_is_dm_partition(info): return (device_is_dm(info) and -- 2.1.0

4 4

[PATCH atomic-rhel-7.1] rescue: find root partition of ostree (atomic) installations (#1152041)
by Radek Vykydal 21 Jan '15

21 Jan '15

This patch is targeted for RHEL Atomic Host 7.1 which is using 7.0 anaconda plus patches in atomic-rhel-7.1 dist-git branch. So the patch should go to rhel7-branch in 7.2 dev. --- pyanaconda/rescue.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/pyanaconda/rescue.py b/pyanaconda/rescue.py index e0c4e13..fbf3f06 100644 --- a/pyanaconda/rescue.py +++ b/pyanaconda/rescue.py @@ -264,6 +264,42 @@ def _unlock_devices(intf, storage): device.format.passphrase = None try_passphrase = None +def findExistingOstreePartitions(devicetree): + import blivet + if not os.path.exists(blivet.getTargetPhysicalRoot()): + util.makedirs(blivet.getTargetPhysicalRoot()) + + roots = [] + for device in devicetree.leaves: + if not device.format.linuxNative or not device.format.mountable or \ + not device.controllable: + continue + + try: + device.setup() + except Exception: # pylint: disable=broad-except + log.warning("setup of %s failed", [device.name]) + continue + + options = device.format.options + ",ro" + try: + device.format.mount(options=options, mountpoint=iutil.getSysroot()) + except Exception: # pylint: disable=broad-except + log.warning("mount of %s as %s failed", device.name, device.format.type) + device.teardown() + continue + + if not os.access(iutil.getSysroot() + "/ostree", os.R_OK): + device.teardown(recursive=True) + continue + + name = _("Ostree on %s") % device.name + roots.append(blivet.Root(mounts=None, swaps=None, name=device.name)) + + return roots + + + def doRescue(intf, rescue_mount, ksdata): import blivet @@ -323,6 +359,7 @@ def doRescue(intf, rescue_mount, ksdata): blivet.storageInitialize(sto, ksdata, []) _unlock_devices(intf, sto) roots = blivet.findExistingInstallations(sto.devicetree) + roots.extend(findExistingOstreePartitions(sto.devicetree)) if not roots: root = None -- 1.9.3

4 5

[master] Disable the VNC question if a user specifies text mode on the cmdline. (#1169368)
by Samantha N. Bueno 20 Jan '15

20 Jan '15

Thanks to Menanteau Guy <menantea(a)linux.vnet.ibm.com> for the patch. --- anaconda | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/anaconda b/anaconda index 4ded503..3539b52 100755 --- a/anaconda +++ b/anaconda @@ -568,6 +568,11 @@ def setupDisplay(anaconda, options, addons=None): flags.usevnc = False flags.vncquestion = False + # disable VNC question if text mode is requested in the command line (anaconda inst.text option) + if anaconda.displayMode == 't': + stdoutLog.warning("Not asking for VNC because text mode was explicitly asked for in command line") + flags.vncquestion = False + # disable VNC over text question when not enough memory is available if blivet.util.total_memory() < isys.MIN_GUI_RAM: stdoutLog.warning("Not asking for VNC because current memory (%d) < MIN_GUI_RAM (%d)", blivet.util.total_memory(), isys.MIN_GUI_RAM) -- 1.8.3.1

3 4

[blivet:master 09/21] Simplify NoDevFS.type.
by Anne Mulhern 20 Jan '15

20 Jan '15

Signed-off-by: mulhern <amulhern(a)redhat.com> --- blivet/formats/fs.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py index 6fede96..158b7c4 100644 --- a/blivet/formats/fs.py +++ b/blivet/formats/fs.py @@ -1494,10 +1494,7 @@ class NoDevFS(FS): @property def type(self): - if self.device != self._type: - return self.device - else: - return self._type + return self.device @property def mountType(self): -- 1.9.3

2 20

[blivet][master, rhel7] do not try to install over broken storage (v2)
by David Lehman 20 Jan '15

20 Jan '15

Patch 1 is unchanged, so I'm not resending it. Patch 2 has the conditional flattened out and flags.installer_mode removed. Patch 3 replaces patches 3 and 4 from the previous set. I will move storageInitialize into anaconda, but I'm going to move it along with a bunch of other stuff at a later time.

2 5

[blivet] allow user-specified data alignment for new lvm pvs
by David Lehman 20 Jan '15

20 Jan '15

I'm open to suggestions for a nice way to not always specify the alignment in KiB. It's not worth much code to me, but it would be preferable. David Lehman (1): Allow user-specified values for data alignment of new lvm pvs. (#1178705) blivet/devicelibs/lvm.py | 7 +++++-- blivet/formats/lvmpv.py | 11 +++++++---- tests/devicelibs_test/lvm_test.py | 29 +++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 6 deletions(-) -- 1.9.3

3 5

[blivet][master,rhel7] do not try to install over broken storage
by David Lehman 20 Jan '15

20 Jan '15

The idea is to establish a minimum standard of input quality in terms of initial storage setup. It is not necessary that we be able to handle every possible crazy thing we might encounter. Users deserve some responsibility for preparing their systems for a fresh OS installation. This covers two cases: 1. gpt disklabels with corrupt primary or backup labels 2. lvm volume group name collisions (multiple vg w/ same name) In both cases, if the installer_mode flag is set, we raise an exception. The accompanying anaconda patches install a callback to ask the user if they prefer to go fix the issue using the shell or abort the installation. The first patch is just a basic attempt to prevent issues with active lvm preventing us from clobbering a corrupt gpt disklabel. It is probably not very useful once the third and fourth patches are applied, but it does establish parity between our handling of lvm and md in these situations. The second allows users to avoid the issue temporarily by using kickstart to ignore the offending disk(s). I'm on the fence as to whether we should include the lvm part of patch four in the rhel7-branch. Opinions welcome. The basic reason we have issues trying to clear devices from disks with partially-corrupt gpt disklabels is that we rely on pyparted to manage partitions and disklabels and it currently does not allow us to proceed with partially corrupt disklabels. I know clumens started looking into making pyparted capable of letting us proceed in the face of a partially corrupt gpt disklabel. If that gets done soon enough it would be relevant here, especially if we decide the lvm part of these patches isn't suitable for rhel7-branch. David Lehman (4): Try to deactivate lvm on corrupted gpt disks. Don't raise an exception for failure to scan an ignored disk. Move storageInitialize into anaconda. Raise UnusableConfigurationError when unusable configuration is detected. blivet/__init__.py | 33 +-------------------------------- blivet/devicetree.py | 36 +++++++++++++++++++++++++++--------- blivet/errors.py | 8 ++++---- 3 files changed, 32 insertions(+), 45 deletions(-) -- 1.9.3

3 11

[PATCH] Actually add the new definition of an already-defined repo.
by Chris Lumens 20 Jan '15

20 Jan '15

I left these two lines out of my previous patch. --- pyanaconda/packaging/dnfpayload.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py index d0eb90e..0fd3ac3 100644 --- a/pyanaconda/packaging/dnfpayload.py +++ b/pyanaconda/packaging/dnfpayload.py @@ -240,6 +240,8 @@ class DNFPayload(packaging.PackagePayload): self._base.repos[repo.id].enable() else: self._base.repos.pop(repo.id) + self._base.repos.add(repo) + repo.enable() # If the repo's not already known, we've got to add it. else: self._base.repos.add(repo) -- 2.2.1

2 1

[PATCH] Move hdiso handling code to PackagePayload (#1180765)
by David Shea 19 Jan '15

19 Jan '15

This way the kickstart harddrive command can work outside of yum. --- pyanaconda/packaging/__init__.py | 15 +++++++++++++++ pyanaconda/packaging/yumpayload.py | 17 +---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index de85e80..64985ac 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -1001,6 +1001,21 @@ class PackagePayload(Payload): self.requiredPackages.append(package) log.debug("required packages = %s", self.requiredPackages) + @property + def ISOImage(self): + """ The location of a mounted ISO repo, or None. """ + if not self.data.method.method == "harddrive": + return None + # This could either be mounted to INSTALL_TREE or on + # DRACUT_ISODIR if dracut did the mount. + dev = blivet.util.get_mount_device(INSTALL_TREE) + if dev: + return dev[len(ISO_DIR)+1:] + dev = blivet.util.get_mount_device(DRACUT_ISODIR) + if dev: + return dev[len(DRACUT_ISODIR)+1:] + return None + ### ### METHODS FOR WORKING WITH ENVIRONMENTS ### diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 5948349..742edad 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -63,8 +63,7 @@ except ImportError: log.error("import of yum failed") yum = None -from pyanaconda.constants import BASE_REPO_NAME, DRACUT_ISODIR, INSTALL_TREE, ISO_DIR, MOUNT_DIR, \ - LOGLVL_LOCK, IPMI_ABORTED +from pyanaconda.constants import BASE_REPO_NAME, MOUNT_DIR, LOGLVL_LOCK, IPMI_ABORTED from pyanaconda.flags import flags from pyanaconda import iutil @@ -651,20 +650,6 @@ reposdir=%s log.info("metadata retrieval complete") - @property - def ISOImage(self): - if not self.data.method.method == "harddrive": - return None - # This could either be mounted to INSTALL_TREE or on - # DRACUT_ISODIR if dracut did the mount. - dev = blivet.util.get_mount_device(INSTALL_TREE) - if dev: - return dev[len(ISO_DIR)+1:] - dev = blivet.util.get_mount_device(DRACUT_ISODIR) - if dev: - return dev[len(DRACUT_ISODIR)+1:] - return None - @refresh_base_repo() def _configureAddOnRepo(self, repo): """ Configure a single ksdata repo. """ -- 2.1.0

2 1

[PATCH] Actually install the metacity theme data
by David Shea 19 Jan '15

19 Jan '15

--- anaconda.spec.in | 1 + data/window-manager/theme/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index 299d1de..6a81c97 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -290,6 +290,7 @@ update-desktop-database &> /dev/null || : %files gui %{_libdir}/python*/site-packages/pyanaconda/ui/gui/* %{_datadir}/anaconda/window-manager/glib-2.0/schemas/* +%{_datadir}/themes/Anaconda/* %files tui %{_libdir}/python*/site-packages/pyanaconda/rescue.py diff --git a/data/window-manager/theme/Makefile.am b/data/window-manager/theme/Makefile.am index 1f7fe46..b8ce478 100644 --- a/data/window-manager/theme/Makefile.am +++ b/data/window-manager/theme/Makefile.am @@ -19,4 +19,4 @@ themedir = $(datadir)/themes/Anaconda/metacity-1 -dist_theme_data = metacity-theme-1.xml +dist_theme_DATA = metacity-theme-1.xml -- 2.1.0

2 1

[PATCH rhel7-branch] Adapt to NetworkManager package split-up
by Radek Vykydal 19 Jan '15

19 Jan '15

--- anaconda.spec.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index 53fb340..4fcc10a 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -28,7 +28,7 @@ Source1: anaconda-user-help-%{helpver}.tar.gz %define partedver 1.8.1 %define pypartedver 2.5-2 %define pythonpyblockver 0.45 -%define nmver 1:0.7.1-3.git20090414 +%define nmver 1.0.0-6.git20150107 %define dbusver 1.2.3 %define yumutilsver 1.1.11-3 %define mehver 0.25.2-1 @@ -125,6 +125,7 @@ Requires: isomd5sum >= %{isomd5sum} Requires: yum-utils >= %{yumutilsver} Requires: createrepo Requires: NetworkManager >= %{nmver} +Requires: NetworkManager-team Requires: dhclient Requires: kbd Requires: chrony @@ -174,6 +175,9 @@ Requires: nm-connection-editor Requires: zenity %endif Requires: yelp +%ifnarch s390 s390x +Requires: NetworkManager-wifi +%endif %description gui This package contains graphical user interface for the Anaconda installer. -- 1.9.3

3 4

[blivet][PATCH] Remove an unused and outdated constant
by Vratislav Podzimek 19 Jan '15

19 Jan '15

LVM2 doesn't limit the number of LVs in any way and this constant isn't used anywhere in our code so just let's get rid of it. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- blivet/devicelibs/lvm.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/blivet/devicelibs/lvm.py b/blivet/devicelibs/lvm.py index ce576e2..6e4d27a 100644 --- a/blivet/devicelibs/lvm.py +++ b/blivet/devicelibs/lvm.py @@ -34,8 +34,6 @@ from ..errors import LVMError from ..i18n import _, N_ from ..flags import flags -MAX_LV_SLOTS = 256 - # some of lvm's defaults that we have no way to ask it for LVM_PE_START = Size("1 MiB") LVM_PE_SIZE = Size("4 MiB") -- 2.1.0

2 1

[rhel6-branch] Some s390x patches
by Samantha N. Bueno 19 Jan '15

19 Jan '15

Because when I think of fun, I think of s390x.

4 11

[PATCH 1/3] Hook up jenkins support into makebumpver.
by Chris Lumens 19 Jan '15

19 Jan '15

First, add a line to your ~/.rhbzauth file that points to the json API on your jenkins server: JENKINS=http://jenkins.wherever.com/api/json If this is not set, then the jenkins check will be skipped. Then, make sure the name being passed to makebumpver is the same as the beginning of some jenkins job you want to check, and that self.git_branch is the end of the same jenkins job. Naming is important. For now this is only in an advisory role - jenkins will be checked and if the tests do not pass, a warning will be logged. But it will not stop the build. --- scripts/makebumpver | 54 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/scripts/makebumpver b/scripts/makebumpver index 798e7a7..4300d84 100755 --- a/scripts/makebumpver +++ b/scripts/makebumpver @@ -3,7 +3,7 @@ # makebumpver - Increment version number and add in RPM spec file changelog # block. Ensures rhel*-branch commits reference RHEL bugs. # -# Copyright (C) 2009-2014 Red Hat, Inc. +# Copyright (C) 2009-2015 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published @@ -26,14 +26,17 @@ log = logging.getLogger("bugzilla") log.setLevel(logging.INFO) import bugzilla +from contextlib import closing import datetime import getopt import getpass +import json import os import re import subprocess import sys import textwrap +import urllib from ConfigParser import ConfigParser class MakeBumpVer: @@ -41,6 +44,7 @@ class MakeBumpVer: log.debug("%s", kwargs) self.bzserver = 'bugzilla.redhat.com' self.bzurl = "https://%s/xmlrpc.cgi" % self.bzserver + self.jenkins = None self.username = None self.password = None self.bz = None @@ -57,6 +61,8 @@ class MakeBumpVer: self.username = line[10:].strip('"\'') elif line.startswith('RHBZ_PASSWORD='): self.password = line[14:].strip('"\'') + elif line.startswith('JENKINS='): + self.jenkins = line[8:].strip('"\'') self.gituser = self._gitConfig('user.name') self.gitemail = self._gitConfig('user.email') @@ -82,9 +88,11 @@ class MakeBumpVer: self.skip_all = kwargs.get('skip_all', False) self.tx_config = kwargs.get('tx_config') self.skip_tx = kwargs.get("skip_tx", False) + self.skip_jenkins = kwargs.get("skip_jenkins", False) if self.skip_all: self.skip_acks = True + self.skip_jenkins = True self.skip_tx = True self.git_branch = None @@ -441,6 +449,36 @@ class MakeBumpVer: f.writelines(bottom) f.close() + def check_jenkins(self): + if not self.git_branch: + log.error("No git branch, cannot check jenkins") + return False + + if not self.jenkins: + log.warning("No jenkins defined, skipping") + return True + + ret = True + + with closing(urllib.urlopen(self.jenkins)) as f: + contents = f.readlines() + + j = json.loads(contents[0]) + + # Get the name of the job we should be looking for in jenkins. + # This name is composed from the name of the project, plus the + # branch of the project without any "-branch" stuff at the end. + targetJob = self.name + "-" + self.git_branch + if targetJob.endswith("-branch"): + targetJob = targetJob[:-7] + + for job in j["jobs"]: + if job["name"] == targetJob: + ret = job["color"] == "blue" + break + + return ret + def check_transifex(self): """ Make sure that the transifex branch matches the current git branch @@ -475,6 +513,10 @@ class MakeBumpVer: if not self.skip_tx and not self.check_transifex(): sys.exit(1) + # For now, jenkins is in an advisory role so do not require it to pass. + if not self.skip_jenkins and not self.check_jenkins(): + log.warning("jenkins test results do not pass; ignoring for now") + newVersion = self._incrementVersion() fixedIn = "%s-%s-%s" % (self.name, newVersion, self.release) rpmlog = self._rpmLog(fixedIn) @@ -495,6 +537,7 @@ def usage(cmd): sys.stdout.write(" -S, --skip-all Skip all checks\n") sys.stdout.write(" -d, --debug Turn on debug logging to stdout\n") sys.stdout.write(" --skip-tx Skip checking Transifex config for branch name\n") + sys.stdout.write(" --skip-jenkins Skip checking Jenkins for test results\n") sys.stdout.write("\nThe -i switch is intended for use with utility commits that we do not need to\n") sys.stdout.write("reference in the spec file changelog. The -m switch is used to map a Fedora\n") sys.stdout.write("BZ number to a RHEL BZ number for the spec file changelog. Use -m if you have\n") @@ -509,14 +552,14 @@ def main(argv): tx_config = os.path.realpath(cwd + '/.tx/config') name, version, release, bugreport = None, None, None, None ignore, bugmap = None, None - show_help, unknown, skip_acks, skip_all, skip_tx = False, False, False, False, False + show_help, unknown, skip_acks, skip_all, skip_tx, skip_jenkins = False, False, False, False, False, False opts = [] try: opts, _args = getopt.getopt(sys.argv[1:], 'n:v:r:b:i:m:sSd?', ['name=', 'version=', 'release=', 'bugreport=', 'ignore=', 'map=', - 'debug', 'help', 'skip-tx']) + 'debug', 'help', 'skip-tx', 'skip-jenkins']) except getopt.GetoptError: show_help = True @@ -541,6 +584,8 @@ def main(argv): log.setLevel(logging.DEBUG) elif o in ('--skip-tx'): skip_tx = True + elif o in ('--skip-jenkins'): + skip_jenkins = True elif o in ('-?', '--help'): show_help = True else: @@ -577,7 +622,8 @@ def main(argv): mbv = MakeBumpVer(name=name, version=version, release=release, bugreport=bugreport, ignore=ignore, bugmap=bugmap, configure=configure, spec=spec, skip_acks=skip_acks, - skip_all=skip_all, tx_config=tx_config, skip_tx=skip_tx) + skip_all=skip_all, tx_config=tx_config, skip_tx=skip_tx, + skip_jenkins=skip_jenkins) mbv.run() if __name__ == "__main__": -- 2.2.1

3 6

[PATCH rhel7-branch] network: pass team opts to dracut for netroot (#1075666)
by Radek Vykydal 19 Jan '15

19 Jan '15

Resolves: rhbz#1075666 --- pyanaconda/network.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 05583b9..f86b0c2 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -365,6 +365,11 @@ def dracutBootArguments(devname, ifcfg, storage_ipaddr, hostname=None): if hwaddr: netargs.add("ifname=%s:%s" % (devname, hwaddr.lower())) + if ifcfg.get("TYPE") == "Team" or ifcfg.get("DEVICETYPE") == "Team": + slaves = get_team_slaves([devname, ifcfg.get("UUID")]) + netargs.add("team=%s:%s" % (devname, + ",".join(dev for dev, _cfg in slaves))) + nettype = ifcfg.get("NETTYPE") subchannels = ifcfg.get("SUBCHANNELS") if blivet.arch.isS390() and nettype and subchannels: -- 1.9.3

2 1

[anaconda/initial-setup][rhel7-branch][PATCH] Final help content enablement
by Martin Kolman 19 Jan '15

19 Jan '15

This patch set should be the last part of the puzzle needed to make the help system in RHEL7 Anaconda complete. The first patch adds handling for architectural suffixes, as unlike on Fedora, the RHEL7 installation has some content that differs based on the current architecture. The second patch is a quite minor one - it just redirects the EULA spoke Help! button to show the Initial Setup hub content, as there is not really anything to say about the EULA Spoke. Martin Kolman (1): Add support for architecture suffixes in help files (#1072033) pyanaconda/ihelp.py | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) -- 2.1.0

3 6

[lorax-rhel7] Remove imggraft from aarch64.tmpl (#1174475)
by Brian C. Lane 19 Jan '15

19 Jan '15

rhel7 branch doesn't use imggraft. Related: rhbz#1174475 --- share/aarch64.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/aarch64.tmpl b/share/aarch64.tmpl index 9f8c31c..be5871c 100644 --- a/share/aarch64.tmpl +++ b/share/aarch64.tmpl @@ -41,6 +41,6 @@ mkdir ${KERNELDIR} ${efiargs} -R -J -V '${isolabel}' -T -graft-points \ ${KERNELDIR}=${outroot}/${KERNELDIR} \ ${LIVEDIR}=${outroot}/${LIVEDIR} \ - ${efigraft} ${imggraft} + ${efigraft} treeinfo images-${basearch} boot.iso images/boot.iso %endif -- 1.9.3

2 1

[PATCH] Show the event box immediately when setting infobar messages.
by David Shea 19 Jan '15

19 Jan '15

The only calls to set_info, set_warning and set_error that were not immediately followed by a call to window.show_all() were bugs in that the info bar would not be shown. Move the call to show() into the widget, instead. --- pyanaconda/ui/gui/helpers.py | 1 - pyanaconda/ui/gui/hubs/__init__.py | 2 -- pyanaconda/ui/gui/spokes/custom.py | 22 ---------------------- pyanaconda/ui/gui/spokes/datetime_spoke.py | 2 -- pyanaconda/ui/gui/spokes/network.py | 2 -- pyanaconda/ui/gui/spokes/storage.py | 2 -- widgets/src/BaseWindow.c | 1 + 7 files changed, 1 insertion(+), 31 deletions(-) diff --git a/pyanaconda/ui/gui/helpers.py b/pyanaconda/ui/gui/helpers.py index 11b4b15..320f933 100644 --- a/pyanaconda/ui/gui/helpers.py +++ b/pyanaconda/ui/gui/helpers.py @@ -90,7 +90,6 @@ class GUISpokeInputCheckHandler(GUIInputCheckHandler): self.clear_info() if failed_check: self.set_warning(failed_check.check_status) - self.window.show_all() # Implemented by GUIObject @abstractmethod diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py index a418c19..7da5888 100644 --- a/pyanaconda/ui/gui/hubs/__init__.py +++ b/pyanaconda/ui/gui/hubs/__init__.py @@ -220,12 +220,10 @@ class Hub(GUIObject, common.Hub): if len(self._incompleteSpokes) == 0: if self._checker and not self._checker.check(): self.set_warning(self._checker.error_message) - self.window.show_all() else: msg = _("Please complete items marked with this icon before continuing to the next step.") self.set_warning(msg) - self.window.show_all() self._updateContinueButton() diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index dd87a4d..2866011 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -691,7 +691,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): self._update_all_devices_in_selectors() self._error = e self.set_warning(_(DEVICE_CONFIGURATION_ERROR_MSG)) - self.window.show_all() if not removed_device: # nothing more to do @@ -711,7 +710,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): self.refresh() # this calls self.clear_errors self._error = e self.set_warning(_(UNRECOVERABLE_ERROR_MSG)) - self.window.show_all() return False @ui_storage_logged @@ -777,7 +775,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): self._error = e self.set_warning(_("Device resize request failed. " "Click for details.")) - self.window.show_all() else: _changed_size = True @@ -851,7 +848,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): self._error = e self.set_warning(_("Device reformat request failed. " "Click for details.")) - self.window.show_all() else: # first, remove this selector from any old install page(s) new_selector = None @@ -984,7 +980,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): if error: self._error = error self.set_warning(self._error) - self.window.show_all() self._populate_right_side(selector) return @@ -1006,7 +1001,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): if error: self._error = error self.set_warning(self._error) - self.window.show_all() self._populate_right_side(selector) return @@ -1034,7 +1028,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): raid_level) if error: self.set_warning(error) - self.window.show_all() self._populate_right_side(selector) return @@ -1225,7 +1218,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): except ValueError as e: self._error = e self.set_error(_("Invalid device name: %s") % name) - self.window.show_all() else: new_name = use_dev.name log.debug("changing name of %s to %s", old_name, new_name) @@ -1597,7 +1589,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): # on_info_bar_clicked requires self._error to be set, so set it to the # list of all errors and warnings that storage checking found. - self.window.show_all() self._error = "\n".join(self.errors + self.warnings) return self._error == "" @@ -1703,7 +1694,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): self.set_info(_("Added new %(type)s to existing " "container %(name)s.") % {"type" : type_str, "name" : container.name}) - self.window.show_all() e = None # the factory's error handling has replaced all of the devices @@ -1714,12 +1704,10 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): self._error = e self.set_error(_("Failed to add new device. Click for " "details.")) - self.window.show_all() except OverflowError as e: log.error("invalid size set for partition") self._error = e self.set_error(_("Invalid partition size set. Use a valid integer.")) - self.window.show_all() def on_add_clicked(self, button): self._save_right_side(self._current_selector) @@ -1828,7 +1816,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): self._error = e self.set_warning(_("Device removal request failed. Click " "for details.")) - self.window.show_all() else: if is_logical_partition: self._storage_playground.removeEmptyExtendedPartitions() @@ -2000,7 +1987,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): if not disks: self._error = "No disks selected. Keeping previous disk set." self.set_info(self._error) - self.window.show_all() return if set(disks) != self._device_disks: @@ -2059,7 +2045,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): if not disks: self._error = "No disks selected. Not saving changes." self.set_info(self._error) - self.window.show_all() return log.debug("new container name: %s", name) @@ -2067,7 +2052,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): self._error = _("Volume Group name %s is already in use. Not " "saving changes.") % name self.set_info(self._error) - self.window.show_all() return if (set(disks) != set(self._device_disks) or @@ -2125,7 +2109,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): except ValueError as e: self._error = e self.set_error(_("Invalid device name: %s") % self._device_container_name) - self.window.show_all() self._device_container_name = container_name self.on_update_settings_clicked(None) return @@ -2333,20 +2316,17 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): log.error("doAutoPartition failed: %s", e) self._error = e self.set_error(_("No disks selected.")) - self.window.show_all() except NotEnoughFreeSpaceError as e: # No handling should be required for this. log.error("doAutoPartition failed: %s", e) self._error = e self.set_error(_("Not enough free space on selected disks.")) - self.window.show_all() except (StorageError, BootLoaderError) as e: log.error("doAutoPartition failed: %s", e) self._reset_storage() self._error = e self.set_error(_("Automatic partitioning failed. Click " "for details.")) - self.window.show_all() else: self._devices = self._storage_playground.devices # mark all new containers for automatic size management @@ -2372,7 +2352,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): self._error = messages self.set_error(_("Automatic partitioning failed. Click " "for details.")) - self.window.show_all() def on_create_clicked(self, button, autopartTypeCombo): # Then do autopartitioning. We do not do any clearpart first. This is @@ -2680,7 +2659,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): self._passphraseEntry.set_text("") self.set_warning(_("Failed to unlock encrypted block device. " "Click for details")) - self.window.show_all() return log.info("unlocked %s, now going to populate devicetree...", device.name) diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py index 703e8b8..1648c35 100644 --- a/pyanaconda/ui/gui/spokes/datetime_spoke.py +++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py @@ -1050,11 +1050,9 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke): def _show_no_network_warning(self): self.set_warning(_("You need to set up networking first if you "\ "want to use NTP")) - self.window.show_all() def _show_no_ntp_server_warning(self): self.set_warning(_("You have no working NTP server configured")) - self.window.show_all() def on_ntp_switched(self, switch, *args): if switch.get_active(): diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index a26bdbf..4f34853 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -1446,7 +1446,6 @@ class NetworkSpoke(FirstbootSpokeMixIn, NormalSpoke): msg = _("Host name is not valid: %s") % error self.set_warning(msg) self.network_control_box.entry_hostname.grab_focus() - self.window.show_all() else: self.clear_info() NormalSpoke.on_back_clicked(self, button) @@ -1516,7 +1515,6 @@ class NetworkStandaloneSpoke(StandaloneSpoke): msg = _("Host name is not valid: %s") % error self.set_warning(msg) self.network_control_box.entry_hostname.grab_focus() - self.window.show_all() else: self.clear_info() StandaloneSpoke._on_continue_clicked(self, window, user_data) diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index 4ecdfdc..455c394 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -519,7 +519,6 @@ class StorageSpoke(NormalSpoke, StorageChecker): self.set_warning(_("Error checking storage configuration. Click for details.")) elif self.warnings: self.set_warning(_("Warning checking storage configuration. Click for details.")) - self.window.show_all() def initialize(self): NormalSpoke.initialize(self) @@ -691,7 +690,6 @@ class StorageSpoke(NormalSpoke, StorageChecker): if self.data.bootloader.location == "none": self.set_warning(_("You have chosen to skip boot loader installation. Your system may not be bootable.")) - self.window.show_all() else: self.clear_info() diff --git a/widgets/src/BaseWindow.c b/widgets/src/BaseWindow.c index a70f7cc..a9ce108 100644 --- a/widgets/src/BaseWindow.c +++ b/widgets/src/BaseWindow.c @@ -598,6 +598,7 @@ static void anaconda_base_window_set_info_bar(AnacondaBaseWindow *win, GtkMessag gtk_container_add(GTK_CONTAINER(content_area), label); gtk_info_bar_set_message_type(GTK_INFO_BAR(win->priv->info_bar), ty); gtk_widget_show(win->priv->info_bar); + gtk_widget_show(win->priv->event_box); win->priv->info_shown = TRUE; } -- 2.1.0

2 1

[PATCH 0/3] dnf environment selection
by David Shea 16 Jan '15

16 Jan '15

David Shea (3): Remove unused methods for deselecting environments Add a parameter to environmentGroups for wheter to include optionlist. Move environment group selection logic to PackagePayload (#1179362) pyanaconda/packaging/__init__.py | 9 +++++++-- pyanaconda/packaging/dnfpayload.py | 38 ++++++-------------------------------- pyanaconda/packaging/yumpayload.py | 35 +++++------------------------------ 3 files changed, 18 insertions(+), 64 deletions(-) -- 2.1.0

2 5

[blivet v2] Relax the blivet device name requirements (#1183061)
by David Shea 16 Jan '15

16 Jan '15

Allow ., .., and /'s in all kinds of btrfs device. --- blivet/devices/btrfs.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py index 13adbb4..b650854 100644 --- a/blivet/devices/btrfs.py +++ b/blivet/devices/btrfs.py @@ -138,6 +138,11 @@ class BTRFSDevice(StorageDevice): spec = super(BTRFSDevice, self).fstabSpec return spec + @classmethod + def isNameValid(cls, name): + # Override StorageDevice.isNameValid to allow pretty much anything + return not('\x00' in name) + class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice, RaidDevice): _type = "btrfs volume" vol_id = btrfs.MAIN_VOLUME_ID @@ -567,11 +572,6 @@ class BTRFSSubVolumeDevice(BTRFSDevice, RaidDevice): data.name = self.name data.preexist = self.exists - @classmethod - def isNameValid(cls, name): - # Override StorageDevice.isNameValid to allow / - return not('\x00' in name or name == '.' or name == '..') - class BTRFSSnapShotDevice(BTRFSSubVolumeDevice): """ A btrfs snapshot pseudo-device. -- 2.1.0

2 1

[anaconda][rhel7-branch][PATCH] Update help content version
by Martin Kolman 16 Jan '15

16 Jan '15

7.1.4 is the current latest help content version. Signed-off-by: Martin Kolman <mkolman(a)redhat.com> --- anaconda.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index dc92a15..e0fae07 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -9,7 +9,7 @@ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda %define anacondabuild %{name}-#VERSION# -%define helpver 7.1.1 +%define helpver 7.1.4 # To generate Source0 do: # git clone http://git.fedorahosted.org/git/anaconda.git # git checkout -b archive-branch anaconda-%%{version}-%%{release} -- 2.1.0

2 1

[PATCH] Switch to temporary transifex location
by Brian C. Lane 16 Jan '15

16 Jan '15

The patches are all pretty similar so I'll skip posting them all. I've created: https://www.transifex.com/organization/bcl-anaconda/dashboard with anaconda, blivet and pykickstart projects. I've uploaded the .po files from the last builds of: anaconda master rhel7-branch rhel6-branch blivet master rhel7-branch pykickstart master rhel7-branch I've spot-checked the po files and I *think* they are ok, but transifex changes the format when you pull them so a simple diff or checksum doesn't work. Brian C. Lane (1): Switch to temporary transifex branch .tx/config | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 1.9.3

2 2

[blivet] Allow / in the name of all kinds of btrfs device (#1183061)
by David Shea 16 Jan '15

16 Jan '15

--- blivet/devices/btrfs.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py index 13adbb4..b5df2d0 100644 --- a/blivet/devices/btrfs.py +++ b/blivet/devices/btrfs.py @@ -138,6 +138,11 @@ class BTRFSDevice(StorageDevice): spec = super(BTRFSDevice, self).fstabSpec return spec + @classmethod + def isNameValid(cls, name): + # Override StorageDevice.isNameValid to allow / + return not('\x00' in name or name == '.' or name == '..') + class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice, RaidDevice): _type = "btrfs volume" vol_id = btrfs.MAIN_VOLUME_ID @@ -567,11 +572,6 @@ class BTRFSSubVolumeDevice(BTRFSDevice, RaidDevice): data.name = self.name data.preexist = self.exists - @classmethod - def isNameValid(cls, name): - # Override StorageDevice.isNameValid to allow / - return not('\x00' in name or name == '.' or name == '..') - class BTRFSSnapShotDevice(BTRFSSubVolumeDevice): """ A btrfs snapshot pseudo-device. -- 2.1.0

1 1

livemedia-creator: options to set size of live image rootfs
by Radek Vykydal 15 Jan '15

15 Jan '15

2 3

[lorax/master 1/4] livemedia-creator: Create parent dirs for logfile path
by Brian C. Lane 15 Jan '15

15 Jan '15

The directory where the --logfile is located is also used for other log files and for the anaconda logs when using --no-virt. Create the parent directories if they don't exist. --- src/sbin/livemedia-creator | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index d8ee275..a9b29d7 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -1092,6 +1092,9 @@ def setup_logging(opts): :param opts: options passed to livemedia-creator :type opts: argparse options """ + if not os.path.isdir(os.path.abspath(os.path.dirname(opts.logfile))): + os.makedirs(os.path.abspath(os.path.dirname(opts.logfile))) + # Setup logging to console and to logfile log.setLevel(logging.DEBUG) pylorax_log.setLevel(logging.DEBUG) -- 1.9.3

2 4

[blivet/master] Add docstrings to the methods in loop.py
by Brian C. Lane 15 Jan '15

15 Jan '15

--- blivet/devicelibs/loop.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/blivet/devicelibs/loop.py b/blivet/devicelibs/loop.py index 4270929..bd6d099 100644 --- a/blivet/devicelibs/loop.py +++ b/blivet/devicelibs/loop.py @@ -30,6 +30,13 @@ log = logging.getLogger("blivet") def losetup(args, capture=False): + """ run losetup + + :param list args: Arguments to pass to losetup + :param bool capture: When True the output is captured and returned + :returns: returncode when capture is False (default) or output when it is True. + :raises: LoopError if there is an OSError running losetup + """ if capture: exec_func = util.capture_output else: @@ -44,6 +51,11 @@ def losetup(args, capture=False): return ret def get_backing_file(name): + """ Get the backing file for a loop device + + :param str name: Name of loop device (loop0, loop1, etc.) + :returns: path of the backing file or "" + """ path = "" sys_path = "/sys/class/block/%s/loop/backing_file" % name if os.access(sys_path, os.R_OK): @@ -52,6 +64,13 @@ def get_backing_file(name): return path def get_loop_name(path): + """ Get the name of the loop device associated with a file + + :param str path: Path to the file + :returns: First loop device or "" + + If multiple loop devices are associated with path this will return the first one. + """ args = ["-j", path] buf = losetup(args, capture=True) @@ -68,6 +87,11 @@ def get_loop_name(path): return name def loop_setup(path): + """ Setup a loop device backed by a file + + :param str path: Path to the file to setup the loop device on + :raises: LoopError if there was an error setting up the loop device + """ args = ["-f", path] msg = None try: @@ -79,6 +103,11 @@ def loop_setup(path): raise LoopError("failed to set up loop for %s: %s" % (path, msg)) def loop_teardown(path): + """ Teardown the loop device associated with a file + + :param str path: Path to the loop device + :raises: LoopError if there was an error tearing down the loop device + """ args = ["-d", path] msg = None try: -- 1.9.3

2 1

[PATCH] Run AnacondaExceptionHandler in cmdline mode
by Brian C. Lane 15 Jan '15

15 Jan '15

cmdline mode still needs to have the exception handler run. It exits anaconda when there are problems, without it you can get stuck in a loop in the summary hub when there are incomplete spokes. This adds an interactive argument to it so that when the handler runs in cmdline mode it only prints out the error and calls sys.exit(1) -- skipping the call to the superclass from meh which tries to run a UI to prompt for debugging. --- anaconda | 6 ++---- pyanaconda/exception.py | 28 +++++++++++++++++----------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/anaconda b/anaconda index d97b682..f27280d 100755 --- a/anaconda +++ b/anaconda @@ -1269,10 +1269,8 @@ if __name__ == "__main__": if image_count: anaconda.storage.setupDiskImages() - # only install interactive exception handler in interactive modes - if ksdata.displaymode.displayMode != DISPLAY_MODE_CMDLINE or flags.debug: - from pyanaconda import exception - anaconda.mehConfig = exception.initExceptionHandling(anaconda) + from pyanaconda import exception + anaconda.mehConfig = exception.initExceptionHandling(anaconda) # add our own additional signal handlers signal.signal(signal.SIGUSR1, lambda signum, frame: diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py index b8b8f4f..4b46802 100644 --- a/pyanaconda/exception.py +++ b/pyanaconda/exception.py @@ -49,7 +49,7 @@ log = logging.getLogger("anaconda") class AnacondaExceptionHandler(ExceptionHandler): - def __init__(self, confObj, intfClass, exnClass, tty_num, gui_lock): + def __init__(self, confObj, intfClass, exnClass, tty_num, gui_lock, interactive): """ :see: python-meh's ExceptionHandler :param tty_num: the number of tty the interface is running on @@ -59,6 +59,7 @@ class AnacondaExceptionHandler(ExceptionHandler): ExceptionHandler.__init__(self, confObj, intfClass, exnClass) self._gui_lock = gui_lock self._intf_tty_num = tty_num + self._interactive = interactive def run_handleException(self, dump_info): """ @@ -128,15 +129,19 @@ class AnacondaExceptionHandler(ExceptionHandler): # X not running (Gtk cannot be initialized) if threadMgr.in_main_thread(): log.debug("In the main thread, running exception handler") - if (issubclass (ty, CmdlineError)): - - cmdline_error_msg = _("\nThe installation was stopped due to " - "incomplete spokes detected while running " - "in non-interactive cmdline mode. Since there " - "cannot be any questions in cmdline mode, " - "edit your kickstart file and retry " - "installation.\nThe exact error message is: " - "\n\n%s.\n\nThe installer will now terminate.") % str(value) + if issubclass(ty, CmdlineError) or not self._interactive: + if issubclass(ty, CmdlineError): + cmdline_error_msg = _("\nThe installation was stopped due to " + "incomplete spokes detected while running " + "in non-interactive cmdline mode. Since there " + "cannot be any questions in cmdline mode, " + "edit your kickstart file and retry " + "installation.\nThe exact error message is: " + "\n\n%s.\n\nThe installer will now terminate.") % str(value) + else: + cmdline_error_msg = _("\nRunning in cmdline mode, no interactive debugging " + "allowed.\nThe exact error message is: " + "\n\n%s.\n\nThe installer will now terminate.") % str(value) # since there is no UI in cmdline mode and it is completely # non-interactive, we can't show a message window asking the user @@ -259,9 +264,10 @@ def initExceptionHandling(anaconda): # anaconda-tb file conf.register_callback("journalctl", journalctl_callback, attchmnt_only=False) + interactive = not anaconda.displayMode == 'c' handler = AnacondaExceptionHandler(conf, anaconda.intf.meh_interface, ReverseExceptionDump, anaconda.intf.tty_num, - anaconda.gui_initialized) + anaconda.gui_initialized, interactive) handler.install(anaconda) return conf -- 1.9.3

2 1

[anaconda/lorax/initial-setup] Rearrange how we interact with the window manager
by David Shea 15 Jan '15

15 Jan '15

The live installer requires that certain things be configured in the window manager that we're running in, but since we're running fullscreen it's kind of hard to get back to it without just quitting. Instead, run maximized, and use a GtkWindow property to hide the titlebar in GNOME and make things look a little nicer. To keep the fullscreen appearance on the non-live media, modify the metacity theme, and that's where the lorax changes come in. Carry the metacity config bits in anaconda instead of lorax, so initial-setup can use them too, and add a copy of the theme that we were using, modified to remove the titlebar. Clean up all the theme bits that lorax no longer cares about. The anaconda change will need to be built first, since the lorax changes remove all metacity theme files from the stage2, and without the one file added back by anaconda metacity will not run. anaconda: Maximize anaconda instead of running fullscreen (#1164457) Move metacity gsettings overrides into anaconda Install a metacity theme to remove the titlebar. anaconda | 11 + anaconda.spec.in | 5 + configure.ac | 3 + data/Makefile.am | 2 +- data/window-manager/Makefile.am | 20 + data/window-manager/config/Makefile.am | 39 + ...g.gnome.desktop.wm.keybindings.gschema.override | 35 + ...g.gnome.desktop.wm.preferences.gschema.override | 5 + data/window-manager/theme/Makefile.am | 22 + data/window-manager/theme/metacity-theme-1.xml | 958 +++++++++++++++++++++ pyanaconda/ui/gui/__init__.py | 25 +- scripts/makeupdates | 27 +- 12 files changed, 1131 insertions(+), 21 deletions(-) create mode 100644 data/window-manager/Makefile.am create mode 100644 data/window-manager/config/Makefile.am create mode 100644 data/window-manager/config/org.gnome.desktop.wm.keybindings.gschema.override create mode 100644 data/window-manager/config/org.gnome.desktop.wm.preferences.gschema.override create mode 100644 data/window-manager/theme/Makefile.am create mode 100644 data/window-manager/theme/metacity-theme-1.xml lorax: Remove the GSettings overrides for metacity Remove fedora-gnome-theme Remove fedora-icon-theme ...g.gnome.desktop.wm.keybindings.gschema.override | 35 ---------------------- ...g.gnome.desktop.wm.preferences.gschema.override | 4 --- share/runtime-cleanup.tmpl | 5 ---- share/runtime-install.tmpl | 6 ++-- share/runtime-postinstall.tmpl | 5 ---- 5 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 share/config_files/common/org.gnome.desktop.wm.keybindings.gschema.override delete mode 100644 share/config_files/common/org.gnome.desktop.wm.preferences.gschema.override initial-setup: Use anaconda's metacity settings when running metacity firstboot-windowmanager | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- 2.1.0

4 20

[blivet-rhel7/master] get_loop_name shoud return an empty name if it isn't found (#980510)
by Brian C. Lane 14 Jan '15

14 Jan '15

Callers expect a name or "" not an error. Related: rhbz#980510 --- blivet/devicelibs/loop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blivet/devicelibs/loop.py b/blivet/devicelibs/loop.py index 661a32e..4270929 100644 --- a/blivet/devicelibs/loop.py +++ b/blivet/devicelibs/loop.py @@ -57,7 +57,7 @@ def get_loop_name(path): entries = buf.splitlines() if not entries: - raise LoopError("No loop associated with %s" % (path)) + return "" first_entry = entries[0] if len(entries) > 1: -- 1.9.3

2 2

[blivet-gui:master 0/9] Pylint patches
by Anne Mulhern 14 Jan '15

14 Jan '15

_Please_ note warning below. Initial setup and some fixes. Attached below are remaining pylint errors. Most are just unused-argument which are probably intentionally unused, due to GUI interface requirements and probably just need to be suppressed. A few are no-member; maybe set_margin_start should be set_margin_left, but I am not sure. It is customary to put this stuff in tests/pylint subdirectory, so I did. I had to remove tests entry from .gitignore. Please make sure not to kill your local private tests directory if such a thing exists, by applying these patches. Thanks. ************* Module blivetgui/actions_toolbar.py blivetgui/actions_toolbar.py:152: [W0613(unused-argument), ActionsToolbar.on_delete_clicked] Unused argument 'button' blivetgui/actions_toolbar.py:158: [W0613(unused-argument), ActionsToolbar.on_add_clicked] Unused argument 'button' blivetgui/actions_toolbar.py:164: [W0613(unused-argument), ActionsToolbar.on_edit_clicked] Unused argument 'button' blivetgui/actions_toolbar.py:170: [W0613(unused-argument), ActionsToolbar.on_umount_clicked] Unused argument 'button' blivetgui/actions_toolbar.py:176: [W0613(unused-argument), ActionsToolbar.on_decrypt_clicked] Unused argument 'button' blivetgui/actions_toolbar.py:182: [W0613(unused-argument), ActionsToolbar.on_apply_clicked] Unused argument 'button' blivetgui/actions_toolbar.py:188: [W0613(unused-argument), ActionsToolbar.on_clear_clicked] Unused argument 'button' blivetgui/actions_toolbar.py:194: [W0613(unused-argument), ActionsToolbar.on_undo_clicked] Unused argument 'button' ************* Module blivetgui/dialogs/edit_dialog.py blivetgui/dialogs/edit_dialog.py:164: [W0613(unused-argument), PartitionEditDialog.on_format_changed] Unused argument 'event' blivetgui/dialogs/edit_dialog.py:382: [W0613(unused-argument), LVMEditDialog.on_cell_toggled] Unused argument 'toggle' blivetgui/dialogs/edit_dialog.py:385: [W0613(unused-argument), LVMEditDialog.on_cell_radio_toggled] Unused argument 'toggle' ************* Module blivetgui/list_partitions.py blivetgui/list_partitions.py:77: [E1101(no-member), ListPartitions.__init__] Instance of 'Label' has no 'set_margin_start' member blivetgui/list_partitions.py:78: [E1101(no-member), ListPartitions.__init__] Instance of 'Label' has no 'set_margin_end' member blivetgui/list_partitions.py:863: [W0613(unused-argument), ListPartitions.quit] Unused argument 'widget' blivetgui/list_partitions.py:863: [W0613(unused-argument), ListPartitions.quit] Unused argument 'event' ************* Module blivetgui/dialogs/other_dialogs.py blivetgui/dialogs/other_dialogs.py:187: [W0613(unused-argument), KickstartSelectDevicesDialog.on_cell_toggled] Unused argument 'event' blivetgui/dialogs/other_dialogs.py:214: [W0613(unused-argument), KickstartSelectDevicesDialog.on_boot_changed] Unused argument 'event' ************* Module blivetgui/dialogs/add_dialog.py blivetgui/dialogs/add_dialog.py:264: [W0613(unused-argument), SizeChooserArea.get_size_precision] Unused argument 'unit' blivetgui/dialogs/add_dialog.py:683: [W0613(unused-argument), AddDialog.on_raid_type_changed] Unused argument 'event' blivetgui/dialogs/add_dialog.py:807: [W0613(unused-argument), AddDialog.on_cell_toggled] Unused argument 'event' blivetgui/dialogs/add_dialog.py:983: [W0613(unused-argument), AddDialog.on_md_type_changed] Unused argument 'event' blivetgui/dialogs/add_dialog.py:1129: [W0613(unused-argument), AddDialog.on_devices_combo_changed] Unused argument 'event' blivetgui/dialogs/add_dialog.py:1253: [W0613(unused-argument), AddDialog.on_ok_clicked] Unused argument 'event' ************* Module blivetgui/devicevisualization/device_canvas.py blivetgui/devicevisualization/device_canvas.py:390: [W0613(unused-argument), DeviceCanvas.button_press_event] Unused argument 'darea' ************* Module blivetgui/actions_menu.py blivetgui/actions_menu.py:129: [W0613(unused-argument), ActionsMenu.on_add_item] Unused argument 'event' blivetgui/actions_menu.py:134: [W0613(unused-argument), ActionsMenu.on_delete_item] Unused argument 'event' blivetgui/actions_menu.py:139: [W0613(unused-argument), ActionsMenu.on_edit_item] Unused argument 'event' blivetgui/actions_menu.py:144: [W0613(unused-argument), ActionsMenu.on_umount_item] Unused argument 'event' blivetgui/actions_menu.py:149: [W0613(unused-argument), ActionsMenu.on_decrypt_item] Unused argument 'event' ************* Module examples/embeded.py examples/embeded.py:58: [W0613(unused-argument), SocketWindow.plugged_event] Unused argument 'widget' ************* Module blivetgui/main_menu.py blivetgui/main_menu.py:256: [W0613(unused-argument), MainMenu.on_about_item] Unused argument 'args' blivetgui/main_menu.py:262: [W0613(unused-argument), MainMenu.on_help_item] Unused argument 'args' blivetgui/main_menu.py:295: [W0613(unused-argument), MainMenu.on_undo_item] Unused argument 'args' blivetgui/main_menu.py:301: [W0613(unused-argument), MainMenu.on_clear_item] Unused argument 'args' blivetgui/main_menu.py:307: [W0613(unused-argument), MainMenu.on_apply_item] Unused argument 'args' blivetgui/main_menu.py:313: [W0613(unused-argument), MainMenu.on_add_item] Unused argument 'args' blivetgui/main_menu.py:319: [W0613(unused-argument), MainMenu.on_delete_item] Unused argument 'args' blivetgui/main_menu.py:325: [W0613(unused-argument), MainMenu.on_edit_item] Unused argument 'args' blivetgui/main_menu.py:331: [W0613(unused-argument), MainMenu.on_umount_item] Unused argument 'args' blivetgui/main_menu.py:337: [W0613(unused-argument), MainMenu.on_decrypt_item] Unused argument 'args' blivetgui/main_menu.py:343: [W0613(unused-argument), MainMenu.on_quit_item] Unused argument 'args' blivetgui/main_menu.py:349: [W0613(unused-argument), MainMenu.on_reload_item] Unused argument 'args' ************* Module blivetgui/processing_window.py blivetgui/processing_window.py:112: [W0613(unused-argument), ProcessingActions.on_timeout] Unused argument 'user_data' mulhern (9): Initial pylint setup. Fix bad indentation. Do not use builtin name format as parameter name. Do not use wildcard import. Move % operator outside translation. Omit needless imports. Omit or hide unused variables and computations. Change relative to absolute imports. Suppress broad-except pylint errors. .gitignore | 1 - blivet-gui | 2 +- blivetgui/devicevisualization/device_canvas.py | 2 +- blivetgui/dialogs/edit_dialog.py | 6 +- blivetgui/list_partitions.py | 2 +- blivetgui/main.py | 8 +- blivetgui/processing_window.py | 4 +- blivetgui/udisks_loop.py | 3 - blivetgui/utils.py | 16 +- examples/embeded.py | 4 +- tests/lib/testlib.sh | 37 ++++ tests/pylint/intl.py | 63 +++++++ tests/pylint/pointless-override.py | 252 +++++++++++++++++++++++++ tests/pylint/pylint-false-positives | 0 tests/pylint/pylint-one.sh | 33 ++++ tests/pylint/runpylint.sh | 125 ++++++++++++ tests/testenv.sh | 13 ++ 17 files changed, 544 insertions(+), 27 deletions(-) create mode 100644 tests/lib/testlib.sh create mode 100644 tests/pylint/intl.py create mode 100644 tests/pylint/pointless-override.py create mode 100644 tests/pylint/pylint-false-positives create mode 100755 tests/pylint/pylint-one.sh create mode 100755 tests/pylint/runpylint.sh create mode 100644 tests/testenv.sh -- 1.9.3

2 10

[PATCH pyparted] Add new functions to extend exception handling.
by Chris Lumens 14 Jan '15

14 Jan '15

We've been avoiding this for an awful long time, but there is now a need for users of pyparted to be able to specify what answers should be given to parted exceptions that ask a question. Specifically, we need to be able to ask the user whether to proceed with a disk containing a corrupted GPT disk label or not. This adds a function to register a callback that can prompt the user (among other possible actions) and a function to clear this callback to restore default behavior. --- src/_pedmodule.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 125 insertions(+), 10 deletions(-) diff --git a/src/_pedmodule.c b/src/_pedmodule.c index 1a90188..24b1050 100644 --- a/src/_pedmodule.c +++ b/src/_pedmodule.c @@ -5,7 +5,7 @@ * Python module that implements the libparted functionality via Python * classes and other high level language features. * - * Copyright (C) 2007-2013 Red Hat, Inc. + * Copyright (C) 2007-2015 Red Hat, Inc. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions of @@ -53,6 +53,8 @@ char *partedExnMessage = NULL; unsigned int partedExnRaised = 0; +PyObject *exn_handler = NULL; + /* Docs strings are broken out of the module structure here to be at least a * little bit readable. */ @@ -199,6 +201,25 @@ PyDoc_STRVAR(unit_get_by_name_doc, "Returns a Unit given its textual representation. Returns one of the\n" "UNIT_* constants."); +PyDoc_STRVAR(register_exn_handler_doc, +"register_exn_handler(function)\n\n" +"When parted raises an exception, the function registered here will be called\n" +"to help determine what action to take. This does not bypass the exception\n" +"handler pyparted uses. Instead, it can be used to pop up a dialog to ask the\n" +"user which course of action to take, or to provide a different default answer,\n" +"or other actions.\n\n" +"The given function must accept as arguments: (1) an integer corresponding to\n" +"one of the EXCEPTION_TYPE_* constants; (2) an integer corresponding to one of the\n" +"EXCEPTION_OPT_* constants; and (3) a string that is the problem encountered by\n" +"parted. This string will already be translated. The given function must return\n" +"one of the EXCEPTION_RESOLVE_* constants instructing parted how to proceed."); + +PyDoc_STRVAR(clear_exn_handler_doc, +"clear_exn_handler()\n\n" +"Clear any previously added exception handling function. This means the\n" +"default behavior for all parted exceptions will be used, so only safe\n" +"answers to any questions parted asks will be automatically provided."); + PyDoc_STRVAR(_ped_doc, "This module implements an interface to libparted.\n\n" "pyparted provides two API layers: a lower level that exposes the complete\n" @@ -213,6 +234,25 @@ PyDoc_STRVAR(_ped_doc, "For complete documentation, refer to the docs strings for each _ped\n" "method, exception class, and subclass."); +PyObject *py_ped_register_exn_handler(PyObject *s, PyObject *args) { + PyObject *fn = NULL; + + if (!PyArg_ParseTuple(args, "O", &fn)) { + return NULL; + } + + Py_DECREF(exn_handler); + exn_handler = fn; + + Py_RETURN_TRUE; +} + +PyObject *py_ped_clear_exn_handler(PyObject *s, PyObject *args) { + exn_handler = Py_None; + Py_INCREF(exn_handler); + Py_RETURN_TRUE; +} + /* all of the methods for the _ped module */ static struct PyMethodDef PyPedModuleMethods[] = { {"libparted_version", (PyCFunction) py_libparted_get_version, METH_VARARGS, @@ -220,6 +260,11 @@ static struct PyMethodDef PyPedModuleMethods[] = { {"pyparted_version", (PyCFunction) py_pyparted_version, METH_VARARGS, pyparted_version_doc}, + {"register_exn_handler", (PyCFunction) py_ped_register_exn_handler, METH_VARARGS, + register_exn_handler_doc}, + {"clear_exn_handler", (PyCFunction) py_ped_clear_exn_handler, METH_VARARGS, + clear_exn_handler_doc}, + /* pyconstraint.c */ {"constraint_new_from_min_max", (PyCFunction) py_ped_constraint_new_from_min_max, METH_VARARGS, constraint_new_from_min_max_doc}, @@ -365,6 +410,10 @@ PyObject *py_pyparted_version(PyObject *s, PyObject *args) { * main motivation for this function is that methods in our parted module need * to be able to raise specific, helpful exceptions instead of something * generic. + * + * It is also possible for callers to specify a function to help in deciding + * what to do with parted exceptions. See the docs for the + * py_ped_register_exn_handler function. */ static PedExceptionOption partedExnHandler(PedException *e) { switch (e->type) { @@ -378,13 +427,29 @@ static PedExceptionOption partedExnHandler(PedException *e) { if (partedExnMessage == NULL) PyErr_NoMemory(); - - /* - * return 'no' for yes/no question exceptions in libparted, - * prevent any potential disk destruction and pass up an - * exception to our caller - */ - return PED_EXCEPTION_NO; + else if (exn_handler && PyCallable_Check(exn_handler)) { + PyObject *args, *retval; + + args = PyTuple_New(3); + PyTuple_SetItem(args, 0, PyInt_FromLong(e->type)); + PyTuple_SetItem(args, 1, PyInt_FromLong(e->options)); + PyTuple_SetItem(args, 2, PyUnicode_FromString(e->message)); + + retval = PyObject_CallObject(exn_handler, NULL); + Py_DECREF(args); + if (retval != NULL && (PyLong_AsLong(retval) == PED_EXCEPTION_UNHANDLED || (PyLong_AsLong(retval) & e->options) > 0)) + return PyLong_AsLong(retval); + else + /* Call failed, use the default value. */ + return PED_EXCEPTION_NO; + } + else { + /* If no exception handling function was registered to + * tell us what to do, return "no" for any yes/no + * questions to prevent any potential disk destruction. + */ + return PED_EXCEPTION_NO; + } } else { partedExnRaised = 0; return PED_EXCEPTION_IGNORE; @@ -400,8 +465,29 @@ static PedExceptionOption partedExnHandler(PedException *e) { if (partedExnMessage == NULL) PyErr_NoMemory(); - - return PED_EXCEPTION_CANCEL; + else if (exn_handler && PyCallable_Check(exn_handler)) { + PyObject *args, *retval; + + args = PyTuple_New(3); + PyTuple_SetItem(args, 0, PyInt_FromLong(e->type)); + PyTuple_SetItem(args, 1, PyInt_FromLong(e->options)); + PyTuple_SetItem(args, 2, PyUnicode_FromString(e->message)); + + retval = PyObject_CallObject(exn_handler, NULL); + Py_DECREF(args); + if (retval != NULL && (PyLong_AsLong(retval) == PED_EXCEPTION_UNHANDLED || (PyLong_AsLong(retval) & e->options) > 0)) + return PyLong_AsLong(retval); + else + /* Call failed, use the default value. */ + return PED_EXCEPTION_CANCEL; + } + else { + /* If no exception handling function was registered to tell us + * what to do, return "cancel" for any questions to prevent + * any potential disk destruction. + */ + return PED_EXCEPTION_CANCEL; + } /* Raise exceptions for internal parted bugs immediately. */ case PED_EXCEPTION_BUG: @@ -648,6 +734,35 @@ MOD_INIT(_ped) { Py_INCREF(UnknownTypeException); PyModule_AddObject(m, "UnknownTypeException", UnknownTypeException); + /* Exception type constants. */ + PyModule_AddIntConstant(m, "EXCEPTION_TYPE_INFORMATION", PED_EXCEPTION_INFORMATION); + PyModule_AddIntConstant(m, "EXCEPTION_TYPE_WARNING", PED_EXCEPTION_WARNING); + PyModule_AddIntConstant(m, "EXCEPTION_TYPE_ERROR", PED_EXCEPTION_ERROR); + PyModule_AddIntConstant(m, "EXCEPTION_TYPE_FATAL", PED_EXCEPTION_FATAL); + PyModule_AddIntConstant(m, "EXCEPTION_TYPE_BUG", PED_EXCEPTION_BUG); + PyModule_AddIntConstant(m, "EXCEPTION_TYPE_NO_FEATURE", PED_EXCEPTION_NO_FEATURE); + + /* Exception resolution constants. */ + PyModule_AddIntConstant(m, "EXCEPTION_RESOLVE_UNHANDLED", PED_EXCEPTION_UNHANDLED); + PyModule_AddIntConstant(m, "EXCEPTION_RESOLVE_FIX", PED_EXCEPTION_FIX); + PyModule_AddIntConstant(m, "EXCEPTION_RESOLVE_YES", PED_EXCEPTION_YES); + PyModule_AddIntConstant(m, "EXCEPTION_RESOLVE_NO", PED_EXCEPTION_NO); + PyModule_AddIntConstant(m, "EXCEPTION_RESOLVE_OK", PED_EXCEPTION_OK); + PyModule_AddIntConstant(m, "EXCEPTION_RESOLVE_RETRY", PED_EXCEPTION_RETRY); + PyModule_AddIntConstant(m, "EXCEPTION_RESOLVE_IGNORE", PED_EXCEPTION_IGNORE); + PyModule_AddIntConstant(m, "EXCEPTION_RESOLVE_CANCEL", PED_EXCEPTION_CANCEL); + + /* Exception option constants. */ + PyModule_AddIntConstant(m, "EXCEPTION_OPT_OK_CANCEL", PED_EXCEPTION_OK_CANCEL); + PyModule_AddIntConstant(m, "EXCEPTION_OPT_YES_NO", PED_EXCEPTION_YES_NO); + PyModule_AddIntConstant(m, "EXCEPTION_OPT_YES_NO_CANCEL", PED_EXCEPTION_YES_NO_CANCEL); + PyModule_AddIntConstant(m, "EXCEPTION_OPT_IGNORE_CANCEL", PED_EXCEPTION_IGNORE_CANCEL); + PyModule_AddIntConstant(m, "EXCEPTION_OPT_RETRY_CANCEL", PED_EXCEPTION_RETRY_CANCEL); + PyModule_AddIntConstant(m, "EXCEPTION_OPT_RETRY_IGNORE_CANCEL", PED_EXCEPTION_RETRY_IGNORE_CANCEL); + + exn_handler = Py_None; + Py_INCREF(exn_handler); + /* Set up our libparted exception handler. */ ped_exception_set_handler(partedExnHandler); return MOD_SUCCESS_VAL(m); -- 1.9.3

2 1

[lorax-rhel7] Use gcdaa64.efi and make boot.iso on aarch64 (#1174475)
by Brian C. Lane 14 Jan '15

14 Jan '15

From: Peter Jones <pjones(a)redhat.com> Add iso creation and switch to using gcdaa64.efi instead of grubaa64.efi Signed-off-by: Peter Jones <pjones(a)redhat.com> Signed-off-by: Brian C. Lane <bcl(a)redhat.com> (cherry picked from commit 8f582846afad0a992bc86b83d4e1926bc28da3db) Resolves: rhbz#1174475 --- share/aarch64.tmpl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/share/aarch64.tmpl b/share/aarch64.tmpl index 66af43f..9f8c31c 100644 --- a/share/aarch64.tmpl +++ b/share/aarch64.tmpl @@ -25,7 +25,7 @@ mkdir ${KERNELDIR} ## WHeeeeeeee, EFI. ## We could remove the basearch restriction someday.. <% efiargs=""; efigraft="" %> -%if exists("boot/efi/EFI/*/grubaa64.efi"): +%if exists("boot/efi/EFI/*/gcdaa64.efi"): <% efiarch = 'AA64' efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) @@ -35,5 +35,12 @@ mkdir ${KERNELDIR} efigraft += " {0}={1}/{0}".format(img,outroot) %> <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel"/> -%endif + ## make boot.iso + runcmd mkisofs -o ${outroot}/images/boot.iso \ + ${efiargs} -R -J -V '${isolabel}' -T -graft-points \ + ${KERNELDIR}=${outroot}/${KERNELDIR} \ + ${LIVEDIR}=${outroot}/${LIVEDIR} \ + ${efigraft} ${imggraft} + treeinfo images-${basearch} boot.iso images/boot.iso +%endif -- 1.9.3

2 1

[PATCH] livemedia-creator: add a timeout to the log monitor startup
by Brian C. Lane 14 Jan '15

14 Jan '15

--- src/sbin/livemedia-creator | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index a328623..2c92ba2 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -167,6 +167,10 @@ class LogRequestHandler(SocketServer.BaseRequestHandler): class LogServer(SocketServer.TCPServer): """A TCP Server that listens for log data""" + + # Time to wait for a request after startup + timeout = 60 + def __init__(self, log_path, *args, **kwargs): """ Setup the log server -- 1.9.3

2 1

[PATCH 1/2] Include NetworkManager-glib in anaconda-core
by Brian C. Lane 14 Jan '15

14 Jan '15

--- anaconda.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/anaconda.spec.in b/anaconda.spec.in index fb07cb5..c5a270d 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -124,6 +124,7 @@ Requires: isomd5sum >= %{isomd5sum} Requires: yum-utils >= %{yumutilsver} Requires: createrepo_c Requires: NetworkManager >= %{nmver} +Requires: NetworkManager-glib >= %{nmver} Requires: dhclient Requires: libselinux-python Requires: kbd -- 1.9.3

2 2

[lorax] Remove gnome-python2-gconf
by David Shea 13 Jan '15

13 Jan '15

There's nothing in here we can use and we already remove everything that's in it, and having it pulls in gtk2 dependencies that we no longer need. --- share/runtime-cleanup.tmpl | 3 +-- share/runtime-install.tmpl | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl index 530ae2c..821d1b9 100644 --- a/share/runtime-cleanup.tmpl +++ b/share/runtime-cleanup.tmpl @@ -49,7 +49,7 @@ removefrom isomd5sum --allbut /usr/bin/checkisomd5 ## various other things we remove to save space removepkg avahi-autoipd coreutils-libs dash db4-utils diffutils file -removepkg genisoimage gnome-python2 info iptables +removepkg genisoimage info iptables removepkg jasper-libs libXxf86misc removepkg libasyncns libhbaapi libhbalinux removepkg libmcpp libpcap libtiff libutempter linux-atm-libs @@ -209,7 +209,6 @@ removefrom gnome-keyring /etc/xdg/* /usr/bin/* /usr/${libdir}/* /usr/libexec/* removefrom gnome-keyring /usr/share/GConf/* /usr/share/gcr-3/* removefrom gnome-keyring /usr/share/glib-2.0/* /usr/share/gnome-keyring* removefrom gnome-keyring /usr/share/locale/* -removefrom gnome-python2-gconf /usr/share/pygtk/* removefrom gnutls /usr/share/locale/* removefrom gpgme /usr/${libdir}/libgpgme-* removefrom grep /etc/* /usr/share/locale/* diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl index d480384..c5f51f7 100644 --- a/share/runtime-install.tmpl +++ b/share/runtime-install.tmpl @@ -82,7 +82,6 @@ installpkg xorg-x11-drivers xorg-x11-server-Xorg installpkg xorg-x11-server-utils xorg-x11-xauth installpkg dbus-x11 metacity gsettings-desktop-schemas installpkg nm-connection-editor -installpkg gnome-python2-gconf installpkg gobject-introspection installpkg librsvg2 installpkg polkit-desktop-policy -- 2.1.0

2 1

livemedia-creator two little follow-ups of --make-pxe-live patch
by Radek Vykydal 13 Jan '15

13 Jan '15

3 5

[blivet:master 0/2] Patches for pylinting examples directory.
by Anne Mulhern 13 Jan '15

13 Jan '15

mulhern (2): Add __init__ file to examples directory. Fix the pylint errors in the examples directory. examples/__init__.py | 0 examples/factory.py | 2 +- examples/list_devices.py | 2 +- examples/lvm.py | 2 +- examples/partitioning.py | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 examples/__init__.py -- 1.9.3

2 3

[rhel7] Update error handler classes (#1181146)
by Brian C. Lane 12 Jan '15

12 Jan '15

Some of the error classes have changed, they no longer include args. Several of these look odd, passing "" instead of changing the string. This is to make sure that the translations don't need to be updated. Resolves: rhbz#1181146 --- pyanaconda/errors.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pyanaconda/errors.py b/pyanaconda/errors.py index c7197e8..0bdb5cf 100644 --- a/pyanaconda/errors.py +++ b/pyanaconda/errors.py @@ -95,8 +95,9 @@ class ErrorHandler(object): self.ui = ui def _kickstartErrorHandler(self, *args, **kwargs): + exn = kwargs["exception"] message = _("The following error was found while parsing the kickstart " - "configuration file:\n\n%s") % args[0] + "configuration file:\n\n%s") % exn self.ui.showError(message) return ERROR_RAISE @@ -107,10 +108,9 @@ class ErrorHandler(object): return ERROR_RAISE def _fsResizeHandler(self, *args, **kwargs): - message = _("An error occurred while resizing the device %s.") % args[0] - - if "details" in kwargs: - message += "\n\n%s" % kwargs["details"] + exn = kwargs["exception"] + message = _("An error occurred while resizing the device %s.") % exn.details + message += "\n\n%s" % exn self.ui.showError(message) return ERROR_RAISE @@ -123,10 +123,10 @@ class ErrorHandler(object): return ERROR_RAISE def _dirtyFSHandler(self, *args, **kwargs): - devs = kwargs.pop("devices") + exn = kwargs["exception"] message = _("The following file systems for your Linux system were " "not unmounted cleanly. Would you like to mount them " - "anyway?\n%s") % "\n".join(devs) + "anyway?\n%s") % "\n".join(exn.devices) if self.ui.showYesNoQuestion(message): return ERROR_CONTINUE else: @@ -141,7 +141,6 @@ class ErrorHandler(object): self.ui.showError(message) def _invalidImageSizeHandler(self, *args, **kwargs): - filename = args[0] message = _("The ISO image %s has a size which is not " "a multiple of 2048 bytes. This may mean " "it was corrupted on transfer to this computer." @@ -149,7 +148,7 @@ class ErrorHandler(object): "It is recommended that you exit and abort your " "installation, but you can choose to continue if " "you think this is in error. Would you like to " - "continue using this image?") % filename + "continue using this image?") % "" if self.ui.showYesNoQuestion(message): return ERROR_CONTINUE else: @@ -166,9 +165,8 @@ class ErrorHandler(object): return ERROR_RAISE def _mediaMountHandler(self, *args, **kwargs): - device = args[0] message = _("An error occurred mounting the source " - "device %s. Retry?") % device.name + "device %s. Retry?") % "" if self.ui.showYesNoQuestion(message): return ERROR_RETRY else: -- 1.9.3

1 0

[PATCH] Revert "Install optional product and updates packages (#1155228)"
by Brian C. Lane 12 Jan '15

12 Jan '15

This reverts commit 232451a4a23af2ac38155c63f54b6d6d7eb0d86c. Use --installpkgs instead. --- README.product | 5 +++-- share/runtime-install.tmpl | 6 ------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/README.product b/README.product index 190f6c5..d1c974d 100644 --- a/README.product +++ b/README.product @@ -16,5 +16,6 @@ you would put your custom class here: /usr/share/lorax/product/run/install/product/pyanaconda/installclasses/custom.py -If the repository that lorax uses contains packages with lorax-product-* and/or -lorax-updates-* provides it will add these packages to the image. +If the packages containing the product/updates files are not included as part +of normal dependencies you can add specific packages with the --installpkgs +command or the installpkgs paramater of RuntimeBuilder. diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl index d480384..a3f3004 100644 --- a/share/runtime-install.tmpl +++ b/share/runtime-install.tmpl @@ -45,12 +45,6 @@ installpkg grubby installpkg lsscsi s390utils-base s390utils-cmsfs-fuse %endif -## optional product.img or updates.img files -log "Looking for extra lorax-product- packages..." --installpkg lorax-product-* -log "Looking for extra lorax-updates- packages..." --installpkg lorax-updates-* - ## yay, plymouth installpkg plymouth -- 1.9.3

2 1

[PATCH lmc atomic] (v2) Add --make-pxe-live and --make-ostree-live (for Atomic) targets.
by Radek Vykydal 12 Jan '15

12 Jan '15

v2 is addressing Brian's review remarks. Also example kickstart is modified to use local repo from Atomic installer iso. --make-pxe-live target generate live squashfs and initrd for pxe boot. Also generates pxe config template. --make-ostree-live is used for installations of Atomic Host. Additionally to --make-pxe-live it ensures using deployment root instead of physical root of installed disk image where needed. Atomic installation needs to be virt installation with /boot on separate partition (the only way supported by Anaconda currently). Content of boot partition is added to live root fs so that ostree can find deployment by boot configuration. --- README.livemedia-creator | 16 +++ docs/livemedia-creator.1 | 10 +- docs/rhel-atomic-pxe-live.ks | 28 +++++ share/pxe-live/pxe-config.tmpl | 3 + src/pylorax/imgutils.py | 24 +++++ src/pylorax/treebuilder.py | 16 +-- src/sbin/livemedia-creator | 227 ++++++++++++++++++++++++++++++++++++++++- 7 files changed, 307 insertions(+), 17 deletions(-) create mode 100644 docs/rhel-atomic-pxe-live.ks create mode 100644 share/pxe-live/pxe-config.tmpl diff --git a/README.livemedia-creator b/README.livemedia-creator index 419dce3..05357ac 100644 --- a/README.livemedia-creator +++ b/README.livemedia-creator @@ -256,6 +256,22 @@ eg. livemedia-creator --make-tar --iso=/path/to/boot.iso --ks=./docs/fedora-minimal.ks \ --image-name=fedora-root.tar.xz +LIVE IMAGE FOR PXE BOOT +----------------------- + +The --make-pxe-live command will produce squashfs image containing live root +filesystem that can be used for pxe boot. Directory with results will contain +the live image, kernel image, initrd image and template of pxe configuration +for the images. + +ATOMIC LIVE IMAGE FOR PXE BOOT +------------------------------ + +The --make-ostree-live command will produce the same result as --make-pxe-live +for installations of Atomic Host. Example kickstart for such an installation +using Atomic installer iso with local repo included in the image can be found +in docs/rhel-atomic-pxe-live.ks. + DEBUGGING PROBLEMS ------------------ diff --git a/docs/livemedia-creator.1 b/docs/livemedia-creator.1 index 1b0ad20..32a9fe5 100644 --- a/docs/livemedia-creator.1 +++ b/docs/livemedia-creator.1 @@ -4,7 +4,7 @@ livemedia-creator \- Create live install media .SH SYNOPSIS livemedia-creator [-h] - (--make-iso | --make-disk | --make-fsimage | --make-appliance | --make-ami | --make-tar) + (--make-iso | --make-disk | --make-fsimage | --make-appliance | --make-ami | --make-tar | --make-pxe-live | --make-ostree-live) [--iso ISO] [--disk-image DISK_IMAGE] [--fs-image FS_IMAGE] [--ks KS] [--image-name IMAGE_NAME] [--image-only] @@ -71,6 +71,14 @@ Build an ami image Build a tar of the root filesystem. Defaults to root.tar.xz .TP +\fB\-\-make\-pxe\-live\fR +Build a live pxe boot squashfs image + +.TP +\fB\-\-make\-ostree\-live\fR +Build a live pxe boot squashfs image of Atomic Host + +.TP \fB\-\-iso ISO\fR Anaconda installation .iso path to use for virt-install diff --git a/docs/rhel-atomic-pxe-live.ks b/docs/rhel-atomic-pxe-live.ks new file mode 100644 index 0000000..1d8f63f --- /dev/null +++ b/docs/rhel-atomic-pxe-live.ks @@ -0,0 +1,28 @@ +# Settings for unattended installation: +lang en_US.UTF-8 +keyboard us +timezone America/New_York +zerombr +clearpart --all --initlabel +rootpw --plaintext atomic +network --bootproto=dhcp --device=link --activate + +# We are only able to install atomic with separate /boot partition currently +part / --fstype="ext4" --size=6000 +part /boot --size=500 --fstype="ext4" + +shutdown + +services --disabled=cloud-init,cloud-init-local,cloud-final,cloud-config,docker-storage-setup + +# Using ostree repo included in installation iso. Respective ostreesetup command is included here. +# The included kickstart file with the command is created during installation iso compose. +%include /usr/share/anaconda/interactive-defaults.ks + +# We copy content of separate /boot partition to root part when building live squashfs image, +# and we don't want systemd to try to mount it when pxe booting +%post +cat /dev/null > /etc/fstab +%end + + diff --git a/share/pxe-live/pxe-config.tmpl b/share/pxe-live/pxe-config.tmpl new file mode 100644 index 0000000..6b841bb --- /dev/null +++ b/share/pxe-live/pxe-config.tmpl @@ -0,0 +1,3 @@ +# PXE configuration template generated by livemedia-creator +kernel <PXE_DIR>${kernel} +append initrd=<PXE_DIR>${initrd} root=live:<URL>/${liveimg} ${addargs} diff --git a/src/pylorax/imgutils.py b/src/pylorax/imgutils.py index 57d62fb..da58c17 100644 --- a/src/pylorax/imgutils.py +++ b/src/pylorax/imgutils.py @@ -91,6 +91,30 @@ def mksquashfs(rootdir, outfile, compression="default", compressargs=None): compressargs = ["-comp", compression] + compressargs return execWithRedirect("mksquashfs", [rootdir, outfile] + compressargs) +def mkrootfsimg(rootdir, outfile, label, size=2, sysroot=""): + """ + Make rootfs image from a directory + + :param str rootdir: Root directory + :param str outfile: Path of output image file + :param str label: Filesystem label + :param int size: Size of the image, if None computed automatically + :param str sysroot: path to system (deployment) root relative to physical root + """ + if size: + fssize = size * (1024*1024*1024) # 2GB sparse file compresses down to nothin' + else: + fssize = None # Let mkext4img figure out the needed size + + mkext4img(rootdir, outfile, label=label, size=fssize) + # Reset selinux context on new rootfs + with LoopDev(outfile) as loopdev: + with Mount(loopdev) as mnt: + cmd = [ "setfiles", "-e", "/proc", "-e", "/sys", "-e", "/dev", "-e", "/install", + "/etc/selinux/targeted/contexts/files/file_contexts", "/"] + root = join(mnt, sysroot.lstrip("/")) + runcmd(cmd, root=root) + ######## Utility functions ############################################### def mksparse(outfile, size): diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index 12eb348..f51980e 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -156,20 +156,10 @@ class RuntimeBuilder(object): # make live rootfs image - must be named "LiveOS/rootfs.img" for dracut compressargs = compressargs or [] workdir = joinpaths(os.path.dirname(outfile), "runtime-workdir") - if size: - fssize = size * (1024*1024*1024) # 2GB sparse file compresses down to nothin' - else: - fssize = None # Let mkext4img figure out the needed size os.makedirs(joinpaths(workdir, "LiveOS")) - imgutils.mkext4img(self.vars.root, joinpaths(workdir, "LiveOS/rootfs.img"), - label="Anaconda", size=fssize) - - # Reset selinux context on new rootfs - with imgutils.LoopDev( joinpaths(workdir, "LiveOS/rootfs.img") ) as loopdev: - with imgutils.Mount(loopdev) as mnt: - cmd = [ "setfiles", "-e", "/proc", "-e", "/sys", "-e", "/dev", "-e", "/install", - "/etc/selinux/targeted/contexts/files/file_contexts", "/"] - runcmd(cmd, root=mnt) + + imgutils.mkrootfsimg(self.vars.root, joinpaths(workdir, "LiveOS/rootfs.img"), + "Anaconda", size=size) # squash the live rootfs and clean up workdir imgutils.mksquashfs(workdir, outfile, compression, compressargs) diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index e25d422..8b8cf80 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -37,6 +37,7 @@ import shutil import argparse import hashlib import re +import glob # Use pykickstart to calculate disk image size from pykickstart.parser import KickstartParser @@ -53,8 +54,8 @@ from pylorax.treebuilder import findkernels from pylorax.sysutils import joinpaths, remove from pylorax.imgutils import PartitionMount, mksparse, mkext4img, loop_detach from pylorax.imgutils import get_loop_name, dm_detach, mount, umount, Mount -from pylorax.imgutils import mksquashfs, mkqcow2, mktar -from pylorax.executils import execWithRedirect, execWithCapture +from pylorax.imgutils import mksquashfs, mkqcow2, mktar, mkrootfsimg +from pylorax.executils import execWithRedirect, execWithCapture, runcmd # no-virt mode doesn't need libvirt, so make it optional try: @@ -414,6 +415,22 @@ def is_image_mounted(disk_img): return True return False +def find_ostree_root(phys_root): + """ + Find root of ostree deployment + + :param str phys_root: Path to physical root + :returns: Relative path of ostree deployment root + :rtype: str + :raise Exception: More than one deployment roots were found + """ + ostree_root = "" + ostree_sysroots = glob.glob(joinpaths(phys_root, "ostree/boot.0/*/*/0")) + if ostree_sysroots: + if len(ostree_sysroots) > 1: + raise Exception("Too many deployment roots found: %s" % ostree_sysroots) + ostree_root = os.path.relpath(ostree_sysroots[0], phys_root) + return ostree_root def get_arch(mount_dir): """ @@ -499,7 +516,6 @@ def make_fsimage(diskimage, fsimage, img_size=None, label="Anaconda"): mkext4img(img_mount.mount_dir, fsimage, size=img_size, label=label) - def make_runtime(opts, mount_dir, work_dir): """ Make the squashfs image from a directory @@ -527,6 +543,99 @@ def make_runtime(opts, mount_dir, work_dir): log.info("Creating runtime") rb.create_runtime(joinpaths(work_dir, RUNTIME), size=None) +def rebuild_initrds_for_live(opts, sys_root_dir, results_dir): + """ + Rebuild intrds for pxe live image (root=live:http://) + + :param opts: options passed to livemedia-creator + :type opts: argparse options + :param str sys_root_dir: Path to root of the system + :param str results_dir: Path of directory for storing results + """ + if not opts.dracut_args: + dracut_args = DRACUT_DEFAULT + else: + dracut_args = [] + for arg in opts.dracut_args: + dracut_args += arg.split(" ", 1) + log.info("dracut args = {0}".format(dracut_args)) + + dracut = ["dracut", "--nomdadmconf", "--nolvmconf"] + dracut_args + + kdir = "boot" + if opts.ostree: + kernels_dir = glob.glob(joinpaths(sys_root_dir, "boot/ostree/*"))[0] + kdir = os.path.relpath(kernels_dir, sys_root_dir) + + kernels = [kernel for kernel in findkernels(sys_root_dir, kdir) + if hasattr(kernel, "initrd")] + if not kernels: + raise Exception("No initrds found, cannot rebuild_initrds") + + # Hush some dracut warnings. TODO: bind-mount proc in place? + open(joinpaths(sys_root_dir,"/proc/modules"),"w") + + if opts.ostree: + # Dracut assumes to have some dirs in disk image + # /var/tmp for temp files + vartmp_dir = joinpaths(sys_root_dir, "var/tmp") + if not os.path.isdir(vartmp_dir): + os.mkdir(vartmp_dir) + # /root (maybe not fatal) + root_dir = joinpaths(sys_root_dir, "var/roothome") + if not os.path.isdir(root_dir): + os.mkdir(root_dir) + # /tmp (maybe not fatal) + tmp_dir = joinpaths(sys_root_dir, "sysroot/tmp") + if not os.path.isdir(tmp_dir): + os.mkdir(tmp_dir) + + for kernel in kernels: + outfile = kernel.initrd.path + ".live" + log.info("rebuilding %s", outfile) + + kver = kernel.version + + cmd = dracut + [outfile, kver] + runcmd(cmd, root=sys_root_dir) + + new_initrd_path = joinpaths(results_dir, os.path.basename(kernel.initrd.path)) + shutil.move(joinpaths(sys_root_dir, outfile), new_initrd_path) + shutil.copy2(joinpaths(sys_root_dir, kernel.path), results_dir) + + os.unlink(joinpaths(sys_root_dir,"/proc/modules")) + +def create_pxe_config(template, images_dir, live_image_name, add_args = None): + """ + Create template for pxe to live configuration + + :param str images_dir: Path of directory with images to be used + :param str live_image_name: Name of live rootfs image file + :param list add_args: Arguments to be added to initrd= pxe config + """ + + add_args = add_args or [] + + kernels = [kernel for kernel in findkernels(images_dir, kdir="") + if hasattr(kernel, "initrd")] + if not kernels: + return + + kernel = kernels[0] + + add_args_str = " ".join(add_args) + + + try: + result = Template(filename=template).render(kernel=kernel.path, + initrd=kernel.initrd.path, liveimg=live_image_name, + addargs=add_args_str) + except Exception: + log.error(text_error_template().render()) + raise + + with open (joinpaths(images_dir, "PXE_CONFIG"), "w") as f: + f.write(result) def make_livecd(opts, mount_dir, work_dir): """ @@ -588,6 +697,36 @@ def make_livecd(opts, mount_dir, work_dir): return work_dir +def mount_boot_part_over_root(img_mount): + """ + Mount boot partition to /boot of root fs mounted in img_mount + + Used for OSTree so it finds deployment configurations on live rootfs + + param img_mount: object with mounted disk image root partition + type img_mount: imgutils.PartitionMount + """ + root_dir = img_mount.mount_dir + is_boot_part = lambda dir: os.path.exists(dir+"/loader.0") + tmp_mount_dir = tempfile.mkdtemp() + sys_root = find_ostree_root(root_dir) + sysroot_boot_dir = None + for dev, _size in img_mount.loop_devices: + if dev is img_mount.mount_dev: + continue + try: + mount("/dev/mapper/"+dev, mnt=tmp_mount_dir) + if is_boot_part(tmp_mount_dir): + umount(tmp_mount_dir) + sysroot_boot_dir = joinpaths(joinpaths(root_dir, sys_root), "boot") + mount("/dev/mapper/"+dev, mnt=sysroot_boot_dir) + break + else: + umount(tmp_mount_dir) + except subprocess.CalledProcessError as e: + log.debug("Looking for boot partition error: %s", e) + remove(tmp_mount_dir) + return sysroot_boot_dir def novirt_install(opts, disk_img, disk_size, repo_url): """ @@ -840,6 +979,53 @@ def make_image(opts, ks): log.info("Disk Image install successful") return disk_img +def make_live_images(opts, work_dir, root_dir, rootfs_image=None): + """ + Create live images from direcory or rootfs image + + :param opts: options passed to livemedia-creator + :type opts: argparse options + :param str work_dir: Directory for storing results + :param str root_dir: Root directory of live filesystem tree + :param str rootfs_image: Path to live rootfs image to be used + :returns: Path of directory with created images + :rtype: str + """ + sys_root = "" + if opts.ostree: + sys_root = find_ostree_root(root_dir) + + squashfs_root_dir = joinpaths(work_dir, "squashfs_root") + liveos_dir = joinpaths(squashfs_root_dir, "LiveOS") + os.makedirs(liveos_dir) + + if rootfs_image: + rc = execWithRedirect("/bin/ln", [rootfs_image, joinpaths(liveos_dir, "rootfs.img")]) + if rc != 0: + shutil.copy2(rootfs_image, joinpaths(liveos_dir, "rootfs.img")) + else: + log.info("Creating live rootfs image") + mkrootfsimg(root_dir, joinpaths(liveos_dir, "rootfs.img"), "LiveOS", size=None, sysroot=sys_root) + + log.info("Packing live rootfs image") + add_pxe_args = [] + live_image_name = "live-rootfs.squashfs.img" + mksquashfs(squashfs_root_dir, + joinpaths(work_dir, live_image_name), + opts.compression, + opts.compress_args) + + remove(squashfs_root_dir) + + log.info("Rebuilding initramfs for live") + rebuild_initrds_for_live(opts, joinpaths(root_dir, sys_root), work_dir) + + if opts.ostree: + add_pxe_args.append("ostree=/%s" % sys_root) + template = joinpaths(opts.lorax_templates, "pxe-live/pxe-config.tmpl") + create_pxe_config(template, work_dir, live_image_name, add_pxe_args) + + return work_dir def setup_logging(opts): """ @@ -892,6 +1078,10 @@ def main(): help="Build an ami image") action.add_argument("--make-tar", action="store_true", help="Build a tar of the root filesystem") + action.add_argument("--make-pxe-live", action="store_true", + help="Build a live pxe boot squashfs image") + action.add_argument("--make-ostree-live", action="store_true", + help="Build a live pxe boot squashfs image of Atomic Host") parser.add_argument("--iso", type=os.path.abspath, help="Anaconda installation .iso path to use for virt-install") @@ -1091,6 +1281,12 @@ def main(): if opts.app_file: opts.app_file = joinpaths(opts.tmp, opts.app_file) + if opts.make_ostree_live: + opts.make_pxe_live = True + opts.ostree = True + else: + opts.ostree = False + tempfile.tempdir = opts.tmp disk_img = None @@ -1165,6 +1361,31 @@ def main(): make_appliance(opts.disk_image or disk_img, opts.app_name, opts.app_template, opts.app_file, networks, opts.ram, opts.vcpus, opts.arch, opts.title, opts.project, opts.releasever) + elif opts.make_pxe_live: + work_dir = tempfile.mkdtemp() + log.info("working dir is {0}".format(work_dir)) + + if (opts.fs_image or opts.no_virt) and not opts.disk_image: + # Create pxe live images from a filesystem image + disk_img = opts.fs_image or disk_img + with Mount(disk_img, opts="loop") as mnt_dir: + result_dir = make_live_images(opts, work_dir, mnt_dir, rootfs_image=disk_img) + else: + # Create pxe live images from a partitioned disk image + disk_img = opts.disk_image or disk_img + is_root_part = None + if opts.ostree: + is_root_part = lambda dir: os.path.exists(dir+"/ostree/deploy") + with PartitionMount(disk_img, mount_ok=is_root_part) as img_mount: + if img_mount and img_mount.mount_dir: + try: + mounted_sysroot_boot_dir = None + if opts.ostree: + mounted_sysroot_boot_dir = mount_boot_part_over_root(img_mount) + result_dir = make_live_images(opts, work_dir, img_mount.mount_dir) + finally: + if mounted_sysroot_boot_dir: + umount(mounted_sysroot_boot_dir) if opts.result_dir and result_dir: shutil.copytree(result_dir, opts.result_dir) -- 1.9.3

2 2

[anaconda][master,rhel7] handle unusable initial storage setups
by David Lehman 12 Jan '15

12 Jan '15

Move blivet.storageInitialize to pyanaconda.storage_utils as initialize_storage. Then add a loop so that users are prompted and have an opportunity to resolve issues that would prevent successful installation. If such an issue arises, the user can either quit the installation or go resolve the issue in the shell and then retry the storage scan. David Lehman (2): Move blivet.storageInitialize into pyanaconda.storage_utils. Add handling for preexisting unusable storage configurations. anaconda | 4 ++-- pyanaconda/errors.py | 19 +++++++++++++++ pyanaconda/exception.py | 4 ++++ pyanaconda/rescue.py | 3 ++- pyanaconda/storage_utils.py | 42 +++++++++++++++++++++++++++++++++ pyanaconda/ui/gui/spokes/lib/refresh.py | 5 ++-- 6 files changed, 71 insertions(+), 6 deletions(-) -- 1.9.3

3 4

[rhel7-branch][PATCH] Pass a Size instance to blivet instead of number of bytes
by Vratislav Podzimek 12 Jan '15

12 Jan '15

Size instances are now used everywhere in blivet. Related: rhbz#1171116 Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/kickstart.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 1e5b993..795e131 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -231,7 +231,7 @@ def refreshAutoSwapSize(storage): for request in storage.autoPartitionRequests: if request.fstype == "swap": - disk_space = int(getAvailableDiskSpace(storage)) + disk_space = getAvailableDiskSpace(storage) request.size = swap_lib.swapSuggestion(disk_space=disk_space) break -- 2.1.0

2 1

[PATCH] Add log monitoring to lmc --novirt installation
by Brian C. Lane 12 Jan '15

12 Jan '15

Previously if there was an error during a novirt installation that didn't exit the process there was no way to detect it. This uses the new --remotelog option for anaconda to monitor the logs for errors using the same criteria as it does when monitoring a virt install. If there is an error the anaconda process will be terminated and the logs will be gathered up into ./anaconda/ --- src/pylorax/executils.py | 10 +++++++++- src/sbin/livemedia-creator | 40 ++++++++++++++++++++++++++++++++++------ 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/src/pylorax/executils.py b/src/pylorax/executils.py index 0b261c3..6fbb271 100644 --- a/src/pylorax/executils.py +++ b/src/pylorax/executils.py @@ -23,6 +23,7 @@ import os, sys import subprocess import threading +from time import sleep import logging log = logging.getLogger("pylorax") @@ -66,7 +67,7 @@ class tee(threading.Thread): def execWithRedirect(command, argv, stdin = None, stdout = None, stderr = None, root = None, preexec_fn=None, cwd=None, - raise_err=False): + raise_err=False, callback=None): """ Run an external program and redirect the output to a file. @param command The command to run. @param argv A list of arguments. @@ -77,7 +78,11 @@ def execWithRedirect(command, argv, stdin = None, stdout = None, @param preexec_fn function to pass to Popen @param cwd working directory to pass to Popen @param raise_err raise CalledProcessError when the returncode is not 0 + @param callback method to call while waiting for process to exit. @return The return code of command. + + The callback is passed the Popen object. It should return False if + the polling loop should be exited. """ def chroot (): os.chroot(root) @@ -143,6 +148,9 @@ def execWithRedirect(command, argv, stdin = None, stdout = None, preexec_fn=preexec_fn, cwd=cwd, env=env) + if callback: + while callback(proc) and proc.poll() is None: + sleep(1) proc.wait() ret = proc.returncode diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index 1472f21..b21cdbe 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -88,7 +88,7 @@ class LogRequestHandler(SocketServer.BaseRequestHandler): if self.server.log_path: self.fp = open(self.server.log_path, "w") # pylint: disable=attribute-defined-outside-init else: - print "no log_path specified" + self.fp = None self.request.settimeout(10) def handle(self): @@ -107,8 +107,9 @@ class LogRequestHandler(SocketServer.BaseRequestHandler): try: data = self.request.recv(4096) - self.fp.write(data) - self.fp.flush() + if self.fp: + self.fp.write(data) + self.fp.flush() # check the data for errors and set error flag # need to assemble it into lines so we can test for the error @@ -130,7 +131,8 @@ class LogRequestHandler(SocketServer.BaseRequestHandler): def finish(self): self.request.close() - self.fp.close() + if self.fp: + self.fp.close() def iserror(self, line): """ @@ -193,7 +195,7 @@ class LogMonitor(object): This needs to be running before the virt-install runs, it expects there to be a listener on the port used for the virtio log port. """ - def __init__(self, log_path, host="localhost", port=0): + def __init__(self, log_path=None, host="localhost", port=0): """ Start a thread to monitor the logs. @@ -203,6 +205,9 @@ class LogMonitor(object): If 0 is passed for the port the dynamically assigned port will be available as self.port + + If log_path isn't set then it only monitors the logs, instead of + also writing them to disk. """ self.server = LogServer(log_path, (host, port), LogRequestHandler) self.host, self.port = self.server.server_address @@ -590,6 +595,23 @@ def make_livecd(opts, mount_dir, work_dir): return work_dir +def novirt_log_check(log_check, proc): + """ + Check to see if there has been an error in the logs + + :param log_check: method to call to check for an error in the logs + :param proc: Popen object for the anaconda process + :returns: True if the process has been terminated + + The log_check method should return a True if an error has been detected. + When an error is detected the process is terminated and this returns True + """ + if log_check(): + proc.terminate() + return True + return False + + def novirt_install(opts, disk_img, disk_size, repo_url): """ Use Anaconda to install to a disk image @@ -648,12 +670,16 @@ def novirt_install(opts, disk_img, disk_size, repo_url): # Create the sparse image mksparse(disk_img, disk_size * 1024**2) + log_monitor = LogMonitor() + args += ["--remotelog", "%s:%s" % (log_monitor.host, log_monitor.port)] + # Make sure anaconda has the right product and release os.environ["ANACONDA_PRODUCTNAME"] = opts.project os.environ["ANACONDA_PRODUCTVERSION"] = opts.releasever log.info("Running anaconda.") try: - execWithRedirect("anaconda", args, raise_err=True) + execWithRedirect("anaconda", args, raise_err=True, + callback=lambda p: not novirt_log_check(log_monitor.server.log_check, p)) # Make sure the new filesystem is correctly labeled args = ["-e", "/proc", "-e", "/sys", "-e", "/dev", @@ -668,6 +694,8 @@ def novirt_install(opts, disk_img, disk_size, repo_url): log.error("Running anaconda failed: %s", e) raise InstallError("novirt_install failed") finally: + log_monitor.shutdown() + # Move the anaconda logs over to a log directory log_dir = os.path.abspath(os.path.dirname(opts.logfile)) log_anaconda = joinpaths(log_dir, "anaconda") -- 1.9.3

2 1

[PATCH] Add support for sending logs to a remote host with --remotelog
by Brian C. Lane 12 Jan '15

12 Jan '15

Send all the logs to a remote host:port instead of modifying the rsyslog configuration of the host. This will be useful when running anaconda from the cmdline or via livemedia-creator All that's required on the receiving side is netcat listening to the port. --- anaconda | 14 ++++++++++++-- pyanaconda/anaconda_log.py | 11 ++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/anaconda b/anaconda index 4ded503..d97b682 100755 --- a/anaconda +++ b/anaconda @@ -309,6 +309,7 @@ def parseArguments(argv=None, boot_cmdline=None): # Obvious ap.add_argument("--loglevel", metavar="LEVEL", help=help_parser.help_text("loglevel")) ap.add_argument("--syslog", metavar="HOST[:PORT]", help=help_parser.help_text("syslog")) + ap.add_argument("--remotelog", metavar="HOST:PORT", help=help_parser.help_text("remotelog")) from pykickstart.constants import SELINUX_DISABLED, SELINUX_ENFORCING from pyanaconda.constants import SELINUX_DEFAULT @@ -409,8 +410,17 @@ def setupLoggingFromOpts(options): packaging_log = logging.getLogger("packaging") anaconda_log.setHandlersLevel(packaging_log, level) - if options.syslog: - anaconda_log.logger.updateRemote(options.syslog) + if can_touch_runtime_system("syslog setup"): + if options.syslog: + anaconda_log.logger.updateRemote(options.syslog) + + if options.remotelog: + try: + host, port = options.remotelog.split(":", 1) + port = int(port) + anaconda_log.logger.setup_remotelog(host, port) + except ValueError: + log.error("Could not setup remotelog with %s", options.remotelog) def gtk_warning(title, reason): from gi.repository import Gtk diff --git a/pyanaconda/anaconda_log.py b/pyanaconda/anaconda_log.py index 498d64a..b5e525c 100644 --- a/pyanaconda/anaconda_log.py +++ b/pyanaconda/anaconda_log.py @@ -23,7 +23,7 @@ # import logging -from logging.handlers import SysLogHandler, SYSLOG_UDP_PORT +from logging.handlers import SysLogHandler, SocketHandler, SYSLOG_UDP_PORT import os import sys import types @@ -86,6 +86,10 @@ class AnacondaSyslogHandler(SysLogHandler): """Map the priority level to a syslog level """ return self.levelMap.get(level, SysLogHandler.mapPriority(self, level)) +class AnacondaSocketHandler(SocketHandler): + def makePickle(self, record): + return ENTRY_FORMAT % record.__dict__ + "\n" + class AnacondaLog: SYSLOG_CFGFILE = "/etc/rsyslog.conf" VIRTIO_PORT = "/dev/virtio-ports/org.fedoraproject.anaconda.log.0" @@ -203,6 +207,11 @@ class AnacondaLog: self.anaconda_logger.warning("%s", warnings.formatwarning( message, category, filename, lineno, line)) + def setup_remotelog(self, host, port): + remotelog = AnacondaSocketHandler(host, port) + remotelog.setLevel(logging.DEBUG) + logging.getLogger().addHandler(remotelog) + def restartSyslog(self): # Import here instead of at the module level to avoid an import loop from pyanaconda.iutil import execWithRedirect -- 1.9.3

2 1

[PATCH] Implement askmethod in dnfpayload
by David Shea 09 Jan '15

09 Jan '15

As a related change, don't fall back to closest mirror if the kickstart method is missing or fails. --- pyanaconda/packaging/dnfpayload.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py index 1b3e4e7..21c68b8 100644 --- a/pyanaconda/packaging/dnfpayload.py +++ b/pyanaconda/packaging/dnfpayload.py @@ -712,6 +712,11 @@ class DNFPayload(packaging.PackagePayload): enabled.append(repo.id) repo.disable() + # If askmethod was specified on the command-line, leave all the repos + # disabled and return + if flags.askmethod: + return + if method.method: try: self._base.conf.releasever = self._getReleaseVersion(url) @@ -740,6 +745,11 @@ class DNFPayload(packaging.PackagePayload): # We need to check this again separately in case method.method was unset above. if not method.method: + # If this is a kickstart install, just return now + if flags.automatedInstall: + return + + # Otherwise, fall back to the default repos that we disabled above for (id_, repo) in self._base.repos.iteritems(): if id_ in enabled: repo.enable() -- 2.1.0

2 1

[PATCH 0/4] Set a default software environment from the instclass
by David Shea 09 Jan '15

09 Jan '15

And some related TUI fixes I found on the way David Shea (4): Translate 'c' in the tui software spoke Add missing translation contexts for TUI navigation keys Fix the FIXME re: tui default software selection Add an installclass property for the default package environment (#1175826) pyanaconda/installclass.py | 3 + pyanaconda/ui/gui/spokes/software.py | 4 ++ pyanaconda/ui/tui/hubs/summary.py | 6 +- pyanaconda/ui/tui/spokes/langsupport.py | 4 +- pyanaconda/ui/tui/spokes/software.py | 111 +++++++++++++++++++++++--------- 5 files changed, 91 insertions(+), 37 deletions(-) -- 2.1.0

2 5

[initial-setup & firstboot][rhel7-branch][PATCH 0/2] Fix Initial Setup and Firstboot console startup scripts on s390
by Martin Kolman 09 Jan '15

09 Jan '15

The following two patches (proposed by jstodola - thanks a lot! :-) ) make Initial Setup and Firstboot start correctly when logging in to the s390 console for the first time after the installation. -- 2.1.0

2 4

[PATCH] Switch kickstart tests to doing VNC instead of graphical.
by Chris Lumens 09 Jan '15

09 Jan '15

X has not been starting properly on these tests for the last couple days, but VNC does work. So switch to that. I'll likely forget to switch it back. --- tests/kickstart_tests/basic-ostree.sh | 2 +- tests/kickstart_tests/groups-and-envs-1.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/kickstart_tests/basic-ostree.sh b/tests/kickstart_tests/basic-ostree.sh index 349263d..b6fab5b 100755 --- a/tests/kickstart_tests/basic-ostree.sh +++ b/tests/kickstart_tests/basic-ostree.sh @@ -19,7 +19,7 @@ # Red Hat Author(s): Chris Lumens <clumens(a)redhat.com> kernel_args() { - echo text + echo vnc } prepare() { diff --git a/tests/kickstart_tests/groups-and-envs-1.sh b/tests/kickstart_tests/groups-and-envs-1.sh index 9ebec79..ebbc9f7 100755 --- a/tests/kickstart_tests/groups-and-envs-1.sh +++ b/tests/kickstart_tests/groups-and-envs-1.sh @@ -18,7 +18,7 @@ # Red Hat Author(s): Chris Lumens <clumens(a)redhat.com> kernel_args() { - echo graphical + echo vnc } prepare() { -- 1.9.3

2 1

[anaconda:master] Patches related to _resizefsUnit (anaconda side)
by Anne Mulhern 09 Jan '15

09 Jan '15

Basically updating use of convertTo() to match change in blivet. mulhern (1): Updates for new Size.convertTo() spec. pyanaconda/kickstart.py | 4 ++-- pyanaconda/ui/gui/spokes/custom.py | 4 ++-- tests/gui/outside/__init__.py | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) -- 1.9.3

2 3

[anaconda][master][PATCH] Update help text for the nodnf option
by Martin Kolman 09 Jan '15

09 Jan '15

Signed-off-by: Martin Kolman <mkolman(a)redhat.com> --- anaconda | 2 +- data/anaconda_options.txt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/anaconda b/anaconda index 4ded503..9220653 100755 --- a/anaconda +++ b/anaconda @@ -355,7 +355,7 @@ def parseArguments(argv=None, boot_cmdline=None): ap.add_argument("--nombr", action="store_true", default=False, help=help_parser.help_text("nombr")) ap.add_argument("--nodnf", action="store_false", dest="dnf", default=True, - help=help_parser.help_text("dnf")) + help=help_parser.help_text("nodnf")) ap.add_argument("--mpathfriendlynames", action="store_true", default=True, help=help_parser.help_text("mpathfriendlynames")) diff --git a/data/anaconda_options.txt b/data/anaconda_options.txt index 12a10d9..02dcdb3 100644 --- a/data/anaconda_options.txt +++ b/data/anaconda_options.txt @@ -223,9 +223,10 @@ installed OS will be booted. /etc/grub.d/40_custom can be used with manually created menuentrys which can use configfile to point to the grub.cfg on the newly installed OS. -dnf -Use the experimental DNF package management backend instead of the YUM backend -that is used by default. For more information about the DNF project see: +nodnf +Don't use the DNF package management backend (default since F22) and +use the legacy YUM backend instead. +For more information about the DNF project see: http://dnf.baseurl.org mpathfriendlynames -- 2.1.0

2 1

[PATCH 0/2] Animate screen transitions
by David Shea 09 Jan '15

09 Jan '15

Animate the transitions from one screen to another. Hopefully this will ease the confusion that some users experience with the hub and spoke model. David Shea (2): Animate the screen transitions. Force a background in the main GtkBox in anaconda windows. pyanaconda/ui/gui/__init__.py | 13 ++++++++++++- widgets/src/BaseWindow.c | 8 ++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) -- 2.1.0

3 4

[blivet:master 00/16] Patches related to _resizefsUnit
by Anne Mulhern 09 Jan '15

09 Jan '15

Mostly the same as before except: I ended up combining the revised version of Do not compare the same two values twice with Do not calculate Sizes unless they are needed. I dropped: Add a new way of specifying Sizes(). Use tuples to construct Sizes() wherever units are known. since there is a better way of handling how we construct Sizes. I dropped: Add _resizefsUnit to TmpFS and use in appropriate places and I'll be adding it to my other patches related to TmpFS in due course. The only changed patch is: Use _resizefsUnit in resizeArgs() method implementations. so that's the only one I'm sending. mulhern (16): Get rid of unnecessary use of long. Make possiblePhysicalExtents() a bit more direct. Do not compare the same two values twice. Avoid using Size constant in FileDevice._create(). Eliminate redundant test. Comment _prefixTestHelper() and eliminate some redundancies. Hoist _BINARY_FACTOR * min_value calculation out of loop. Make _Prefix entries named constants. Add unitStr() method. Make _parseUnits() return a unit constant, rather than a number. Get whole unit tuple in loop when searching for correct units. Do not even pretend that ReiserFS is resizable. Change convertTo() and roundToNearest() so each takes a units specifier. Use convertTo in humanReadable(). Do not supply a default implementation for the resizeArgs() method. Use _resizefsUnit in resizeArgs() method implementations. blivet/devicelibs/lvm.py | 29 ++++----- blivet/devicelibs/swap.py | 19 +++--- blivet/devices/file.py | 9 ++- blivet/devices/lvm.py | 16 ++--- blivet/devices/partition.py | 8 +-- blivet/formats/fs.py | 44 +++++++------ blivet/size.py | 130 +++++++++++++++++++------------------- tests/devicelibs_test/lvm_test.py | 5 -- tests/size_test.py | 92 ++++++++++++--------------- tests/storagetestcase.py | 4 +- 10 files changed, 173 insertions(+), 183 deletions(-) -- 1.9.3

2 2

[Patch for Review] Make colon optional while adding iSCSI Initiator Name in Anaconda installer
by Sujith_Pandel＠Dell.com 09 Jan '15

09 Jan '15

Hi All, Sincere Apologies for sending this once again. I made a mistake of including mail restriction note while sending the previous mail. Sorry once again. This patch modifies the requirement of ":" (colon) to be present compulsorily in iSCSI Initiator name in Anaconda installer while adding an iSCSI Disk. Currently while adding an iSCSI Initiator name during installation using Anaconda installer, the iSCSI Initiator name should be containing "." (dot) and ":" (colon) in the iSCSI Qualified Name (IQN) format. (Ex: iqn.2001-04.com.example:diskarrays-sn-a8675309 ) Without both of them the "Start Discovery" button remains greyed out and the user is unable to discover/add iSCSI target. However, according to RFC 3720 and RFC 3721, the IQN names may contain a colon optionally. Hence presence of colon in IQN names should not be considered as a mandatory condition while checking the validity of IQN Initiator name. This can also be applied for EUI format of iSCSI Naming where only dots will be present. Requesting review and inclusion to git repo. **************************************************************************************** >From bbbcbb16a5a8979ae8deaa49cbfb594701960c6e Mon Sep 17 00:00:00 2001 From: Sujith Pandel <sujithpshankar(a)gmail.com> Date: Wed, 7 Jan 2015 05:41:34 -0500 Subject: [PATCH] Make colon optional while adding iSCSI Initiator Name Signed-off-by: Sujith Pandel <sujithpshankar(a)gmail.com> --- pyanaconda/ui/gui/spokes/advstorage/iscsi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py index 90a1444..5d2f286 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py +++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py @@ -302,7 +302,8 @@ class ISCSIDialog(GUIObject): text = widget.get_text() stripped = text.strip() - return "." in stripped and ":" in stripped + #iSCSI Naming Standards: RFC 3720 and RFC 3721 + return "." in stripped def on_discover_field_changed(self, *args): # Make up a credentials object so we can test if it's valid. -- 1.9.3 **************************************************************************************** Thanks & Regards, Sujith Pandel

2 1

[PATCH] Add error checks to liveimg mount code (#1178703)
by Brian C. Lane 09 Jan '15

09 Jan '15

Instead of logging the mount error and falling into the rsync and failing later catch problems with mounting the images and moving the mountpoint. Related: rhbz#1178703 --- pyanaconda/packaging/livepayload.py | 67 ++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 23 deletions(-) diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py index 0a67774..17c1bac 100644 --- a/pyanaconda/packaging/livepayload.py +++ b/pyanaconda/packaging/livepayload.py @@ -373,29 +373,50 @@ class LiveImageKSPayload(LiveImagePayload): raise exn # If this looks like a tarfile, skip trying to mount it - if not self.is_tarfile: - # Mount the image and check to see if it is a LiveOS/*.img - # style squashfs image. If so, move it to IMAGE_DIR and mount the real - # root image on INSTALL_TREE - blivet.util.mount(self.image_path, INSTALL_TREE, fstype="auto", options="ro") - if os.path.exists(INSTALL_TREE+"/LiveOS"): - # Find the first .img in the directory and mount that on INSTALL_TREE - img_files = glob.glob(INSTALL_TREE+"/LiveOS/*.img") - if img_files: - img_file = os.path.basename(sorted(img_files)[0]) - - # move the mount to IMAGE_DIR - os.makedirs(IMAGE_DIR, 0o755) - # work around inability to move shared filesystems - iutil.execWithRedirect("mount", - ["--make-rprivate", "/"]) - iutil.execWithRedirect("mount", - ["--move", INSTALL_TREE, IMAGE_DIR]) - blivet.util.mount(IMAGE_DIR+"/LiveOS/"+img_file, INSTALL_TREE, - fstype="auto", options="ro") - - source = iutil.eintr_retry_call(os.statvfs, INSTALL_TREE) - self.source_size = source.f_frsize * (source.f_blocks - source.f_bfree) + if self.is_tarfile: + return + + # Mount the image and check to see if it is a LiveOS/*.img + # style squashfs image. If so, move it to IMAGE_DIR and mount the real + # root image on INSTALL_TREE + rc = blivet.util.mount(self.image_path, INSTALL_TREE, fstype="auto", options="ro") + if rc != 0: + log.error("mount error (%s) with %s", rc, self.image_path) + exn = PayloadInstallError("mount error %s" % rc) + if errorHandler.cb(exn) == ERROR_RAISE: + raise exn + + # Nothing more to mount + if not os.path.exists(INSTALL_TREE+"/LiveOS"): + return + + # Mount the first .img in the directory on INSTALL_TREE + img_files = glob.glob(INSTALL_TREE+"/LiveOS/*.img") + if img_files: + # move the mount to IMAGE_DIR + os.makedirs(IMAGE_DIR, 0o755) + # work around inability to move shared filesystems + rc = iutil.execWithRedirect("mount", + ["--make-rprivate", "/"]) + if rc == 0: + rc = iutil.execWithRedirect("mount", + ["--move", INSTALL_TREE, IMAGE_DIR]) + if rc != 0: + log.error("error %s moving mount", rc) + exn = PayloadInstallError("mount error %s" % rc) + if errorHandler.cb(exn) == ERROR_RAISE: + raise exn + + img_file = IMAGE_DIR+"/LiveOS/"+os.path.basename(sorted(img_files)[0]) + rc = blivet.util.mount(img_file, INSTALL_TREE, fstype="auto", options="ro") + if rc != 0: + log.error("mount error (%s) with %s", rc, img_file) + exn = PayloadInstallError("mount error %s with %s" % (rc, img_file)) + if errorHandler.cb(exn) == ERROR_RAISE: + raise exn + + source = iutil.eintr_retry_call(os.statvfs, INSTALL_TREE) + self.source_size = source.f_frsize * (source.f_blocks - source.f_bfree) def install(self): """ Install the payload if it is a tar. -- 1.9.3

2 1

[PATCH 1/2] Allow specifying pre-defined repos via kickstart with dnf backend (#1177988).
by Chris Lumens 08 Jan '15

08 Jan '15

This is the thing where your kickstart can say: repo --name=updates and anaconda will figure out that you want to use the repo already defined in /etc/anaconda.repos.d. It works with yum, so it also need to work with dnf. --- pyanaconda/packaging/dnfpayload.py | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py index 7a91c26..fab258f 100644 --- a/pyanaconda/packaging/dnfpayload.py +++ b/pyanaconda/packaging/dnfpayload.py @@ -691,6 +691,16 @@ class DNFPayload(packaging.PackagePayload): checkmount) method = self.data.method + # Read in all the repos from the installation environment, make a note of which + # are enabled, and then disable them all. If the user gave us a method, we want + # to use that instead of the default repos. + self._base.read_all_repos() + + enabled = [] + for repo in self._base.repos.iter_enabled(): + enabled.append(repo.name) + repo.disable() + if method.method: try: self._base.conf.releasever = self._getReleaseVersion(url) @@ -716,15 +726,19 @@ class DNFPayload(packaging.PackagePayload): # this preserves the method details while disabling it method.method = None self.install_device = None - - if not method.method: - # only when there's no repo set via method use the repos from the - # install image itself: - log.info('Loading repositories config on the filesystem.') - self._base.read_all_repos() + else: + for (name, repo) in self._base.repos.iteritems(): + if name in enabled: + repo.enable() for ksrepo in self.data.repo.dataList(): - self._add_repo(ksrepo) + # This is a repo we already have a config file in /etc/anaconda.repos.d, + # so we just need to enable it here. See the kickstart docs for the repo + # command. + if not ksrepo.baseurl and not ksrepo.mirrorlist: + self._base.repos[ksrepo.name].enable() + else: + self._add_repo(ksrepo) ksnames = [r.name for r in self.data.repo.dataList()] ksnames.append(constants.BASE_REPO_NAME) -- 1.9.3

2 5

[Patch for Review] Make colon optional while adding iSCSI Initiator Name in Anaconda installer
by Sujith_Pandel＠Dell.com 08 Jan '15

08 Jan '15

Dell - Internal Use - Confidential Hi All, This patch modifies the requirement of ":" (colon) to be present compulsorily in iSCSI Initiator name in Anaconda installer while adding an iSCSI Disk. Currently while adding an iSCSI Initiator name during installation using Anaconda installer, the iSCSI Initiator name should be containing "." (dot) and ":" (colon) in the iSCSI Qualified Name (IQN) format. (Ex: iqn.2001-04.com.example:diskarrays-sn-a8675309 ) Without both of them the "Start Discovery" button remains greyed out and the user is unable to discover/add iSCSI target. However, according to RFC 3720 and RFC 3721, the IQN names may contain a colon optionally. Hence presence of colon in IQN names should not be considered as a mandatory condition while checking the validity of IQN Initiator name. This can also be applied for EUI format of iSCSI Naming where only dots will be present. Requesting review and inclusion to git repo. **************************************************************************************** >From bbbcbb16a5a8979ae8deaa49cbfb594701960c6e Mon Sep 17 00:00:00 2001 From: Sujith Pandel <sujithpshankar(a)gmail.com> Date: Wed, 7 Jan 2015 05:41:34 -0500 Subject: [PATCH] Make colon optional while adding iSCSI Initiator Name Signed-off-by: Sujith Pandel <sujithpshankar(a)gmail.com> --- pyanaconda/ui/gui/spokes/advstorage/iscsi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py index 90a1444..5d2f286 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py +++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py @@ -302,7 +302,8 @@ class ISCSIDialog(GUIObject): text = widget.get_text() stripped = text.strip() - return "." in stripped and ":" in stripped + #iSCSI Naming Standards: RFC 3720 and RFC 3721 + return "." in stripped def on_discover_field_changed(self, *args): # Make up a credentials object so we can test if it's valid. -- 1.9.3 **************************************************************************************** Thanks & Regards, Sujith Pandel

1 0

[PATCH] Implement DNFPayload.environmentOptionIsDefault (#1179905)
by David Shea 08 Jan '15

08 Jan '15

--- pyanaconda/packaging/dnfpayload.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py index f8bfdea..3b223d3 100644 --- a/pyanaconda/packaging/dnfpayload.py +++ b/pyanaconda/packaging/dnfpayload.py @@ -559,7 +559,10 @@ class DNFPayload(packaging.PackagePayload): env = self._base.comps.environment_by_pattern(environmentid) if env is None: raise packaging.NoSuchGroup(environmentid) - return False + + # Look a group in the optionlist that matches the group_id and + # has default set + return any(grp for grp in env.option_ids if grp.name == grpid and grp.default) def groupDescription(self, grpid): """ Return name/description tuple for the group specified by id. """ -- 2.1.0

3 5

[master] Small fixes pylint found with my zfcp patches
by Samantha N. Bueno 07 Jan '15

07 Jan '15

All short and pretty self-explanatory.

2 6

[blivet][master,rhel7] Fix 1166509, 1167292
by David Lehman 07 Jan '15

07 Jan '15

David Lehman (2): Don't crash when a free region is too small for an aligned partition. Use _netdev mount option as needed. (#1166509) blivet/__init__.py | 1 - blivet/devices/btrfs.py | 6 ++++-- blivet/devices/partition.py | 5 ----- blivet/devices/storage.py | 20 ++++++++++++++++++++ blivet/partitioning.py | 18 ++++++++++++------ tests/devices_test.py | 30 ++++++++++++++++++++++++++++++ 6 files changed, 66 insertions(+), 14 deletions(-) -- 1.9.3

3 8

[blivet:master 00/17] Patches about mounting filesystems
by Anne Mulhern 07 Jan '15

07 Jan '15

They are all fairly trivial tests or refactoring cleanups until "Substitute FS.mountopts...". Because mounting and resizing are a bit mixed up in TmpFS, some of these patches are about both actions. I had hoped to put in a satisfactory test about the resizability of TmpFS while I was at it, but it turned out that I really couldn't. mulhern (17): Add a tiny test for TmpFS. Be less eager about processing all lines in /proc/meminfo. Simplify setting options variable. Simplify FS._getOptions(). Tighten up FS.mountable(). Virtualize options property methods in DeviceFormat.options definition. Eliminate some redundant definitions of the device property. Add simple _sizeOption() method to TmpFS class. Simplify TmpFS.resizeArgs() just a bit. Substitute FS.mountopts for TmpFS._options instance variable. Change TmpFS._getOptions() so it always appends _size_option. Have TmpFS.resizeArgs() use default options if options not set. Do not bother to set device.format.mountopts. Set format's mountpoint if it has the mountpoint attribute. Destrengthen self._size_option field. Do not redefine size property in TmpFS. Make TmpFS._resizable False. blivet/__init__.py | 13 ++---- blivet/formats/__init__.py | 6 ++- blivet/formats/fs.py | 98 ++++++++++++++----------------------------- blivet/formats/swap.py | 3 -- blivet/util.py | 7 ++-- tests/formats_test/fs_test.py | 13 ++++++ 6 files changed, 56 insertions(+), 84 deletions(-) -- 1.9.3

4 24

[PATCH 0/3] Fix dnf environment selection
by David Shea 07 Jan '15

07 Jan '15

*** BLURB HERE *** David Shea (3): Remove unused methods for deselecting environments Remove optional groups from environmentGroups Move environment group selection logic to PackagePayload (#1179362) pyanaconda/packaging/__init__.py | 7 ++++++- pyanaconda/packaging/dnfpayload.py | 36 ++---------------------------------- pyanaconda/packaging/yumpayload.py | 30 +----------------------------- 3 files changed, 9 insertions(+), 64 deletions(-) -- 2.1.0

2 8

[blivet:master 00/20] Patches related to _resizefsUnit
by Anne Mulhern 07 Jan '15

07 Jan '15

This turns out to be actually quite a lot of patches about Sizes. The first 8 patches are minor fixes for little things that I ran into while worrying about Sizes. With "Make _Prefix entries..." I'm starting to try to set things up so that it is possible to have some kind of values that represent units to pass to convertTo() and roundToNearest(). By using string specifiers of units as arguments to these methods, we end up using _parseUnits() to find out the units. This is kind of a mistake, because it is a method that is really designed for parsing human input size strings, so it is unnecessarily heavyweight for a context where the units is precisely known and specified explicitly in the program. "Do not even pretend..." patch is a bit of a one off. I really think we can get rid of that code, about the only thing it is likely ever to do for us is halt some install sometime (if it is ever run). Then come three patches about resizeArgs() and _resizefsUnit. The last two of these may be somewhat controversial. Here's my take on things: Without the "Use _resizefsUnit in resizeArgs()..." patch a developer has to have or somehow obtain some knowledge about the connection between the unit in resizeArgs() and the one in getMinSize(). Let's suppose they change _resizefsUnit (because they want to change how getMinSize() behaves). They can: (1) Fail to realize that they need to change resizeArgs() as well. If they are lucky, and they changed _resizefsUnit to a multiple of the units in resizeArgs() there may or not appear to be a problem. If they are unlucky and they changd _resizefsUnit to something other than a multiple, then the result of the resize operation will most likely be wrong. That would be a bug. (2) Realize that they need to change the units of resizeArgs() correspondingly. If so, they ought to have the good sense to look at the containing expression, and infer that they need to change the format string as well. With the "Use _resizefsUnit in resizeArgs()..." patch a developer does not need to know any secret lore. Being conscientious, they do a search for the string _resizefsUnit and find it in resizeArgs(). They know there is a connection and only possibility (2) from above is available. My patch eliminates the possibility of bugs arising from situation (1). I realize it relies on the programmer being able to realize that if the units of the size change, so should the format string, but I _think_ that's not hard. Finally, there are two patches about Size.__new__. The motivation for these two is to avoid running the _parseSpec() method from Size.__new__() as _parseSpec() is really designed to handle user-input strings. It is far too general for literals specified in the program and is correspondingly busy. The locale stuff, the regular expression matching, iterating through a list dynamically calculating string specs and comparing them with the string given is huge overkill when the unit required is already known at compile time. This approach is less invasive than some others and does not _require_ any change to user code. I think that ideally user input parsing would be handled in anaconda, since that is not really blivet's job at all, but I think that would be in the far future, so might as well do this for now. This approach speeds construction of Size() object up by a factor of 3 or 4, suprisingly little. But it seems like the more correct thing. If everybody accepts it, I'll also convert the Size literals in tests subdirectory to use tuples. mulhern (20): Get rid of unnecessary use of long. Make possiblePhysicalExtents() a bit more direct. Do not compare the same two values twice. Do not calculate Sizes unless they are needed. Avoid using Size constant in FileDevice._create(). Eliminate redundant test. Comment _prefixTestHelper() and eliminate some redundancies. Hoist _BINARY_FACTOR * min_value calculation out of loop. Make _Prefix entries named constants. Add unitStr() method. Make _parseUnits() return a unit constant, rather than a number. Get whole unit tuple in loop when searching for correct units. Do not even pretend that ReiserFS is resizable. Change convertTo() and roundToNearest() so each takes a units specifier. Use convertTo in humanReadable(). Do not supply a default implementation for the resizeArgs() method. Use _resizefsUnit in resizeArgs() method implementations. Add _resizefsUnit to TmpFS and use in appropriate places. Add a new way of specifying Sizes(). Use tuples to construct Sizes() wherever units are known. blivet/devicefactory.py | 6 +- blivet/devicelibs/btrfs.py | 4 +- blivet/devicelibs/crypto.py | 4 +- blivet/devicelibs/lvm.py | 45 +++++----- blivet/devicelibs/mdraid.py | 10 +-- blivet/devicelibs/swap.py | 15 ++-- blivet/devices/file.py | 8 +- blivet/devices/lvm.py | 16 ++-- blivet/devices/partition.py | 12 +-- blivet/formats/biosboot.py | 6 +- blivet/formats/fs.py | 77 ++++++++--------- blivet/formats/prepboot.py | 6 +- blivet/formats/swap.py | 4 +- blivet/partitioning.py | 6 +- blivet/platform.py | 22 ++--- blivet/size.py | 168 ++++++++++++++++++++------------------ blivet/udev.py | 12 +-- blivet/util.py | 6 +- tests/devicelibs_test/lvm_test.py | 5 -- tests/size_test.py | 96 +++++++++++----------- tests/storagetestcase.py | 4 +- 21 files changed, 261 insertions(+), 271 deletions(-) -- 1.9.3

3 28

[rhel7/master] Multiple loops shouldn't be fatal (#980510)
by Brian C. Lane 07 Jan '15

07 Jan '15

Backing files can have multiple loops associated with them without problems. Raising an error here causes a crash when using an iso for both stage2 and for the repo (eg. boot with inst.repo=hd:/dev/sdb1:/path-to-dvd.iso). Instead just use the first loop device in the list as the name. Resolves: rhbz#980510 --- blivet/devicelibs/loop.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/blivet/devicelibs/loop.py b/blivet/devicelibs/loop.py index 0b374a2..1600ed8 100644 --- a/blivet/devicelibs/loop.py +++ b/blivet/devicelibs/loop.py @@ -55,8 +55,9 @@ def get_loop_name(path): args = ["-j", path] buf = losetup(args, capture=True) if len(buf.splitlines()) > 1: - # there should never be more than one loop device listed - raise LoopError("multiple loops associated with %s" % path) + # If there are multiple loop devices use the first one + buf = buf.splitlines()[0] + log.warning("multiple loops associated with %s. Using %s" % (path, buf)) name = os.path.basename(buf.split(":")[0]) return name -- 1.9.3

3 5

[master] Add missing translation context for Add ECKD DASD button in advstorage.
by Samantha N. Bueno 07 Jan '15

07 Jan '15

--- pyanaconda/ui/gui/spokes/filter.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/filter.glade b/pyanaconda/ui/gui/spokes/filter.glade index b2ffcc7..c11e69f 100644 --- a/pyanaconda/ui/gui/spokes/filter.glade +++ b/pyanaconda/ui/gui/spokes/filter.glade @@ -1570,7 +1570,7 @@ </child> <child> <object class="GtkButton" id="addDASDButton"> - <property name="label" translatable="yes">Add EC_KD DASD...</property> + <property name="label" translatable="yes" context="GUI|Installation Destination|Filter">Add EC_KD DASD...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> -- 1.9.3

2 1

[rhel7/master] Preserve kickstart url behavior for mirrorlist (#1109933)
by Brian C. Lane 07 Jan '15

07 Jan '15

url could be --mirrorlist instead of --url. Don't assume url is set, and for mirrorlist pass inst.repo=None to preserve current behavior (there is no cmdline way to represent a mirrorlist). Related: rhbz#1109933 --- dracut/parse-kickstart | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index 304512e..dd981f5 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -81,7 +81,11 @@ class NFS(commands.nfs.FC6_NFS): class URL(commands.url.F18_Url): def dracut_args(self, args, lineno, obj): # Spaces in the url need to be %20 - method = self.url.replace(" ", "%20") + if self.url: + method = self.url.replace(" ", "%20") + else: + method = None + args = ["inst.repo=%s" % method] if self.noverifyssl: -- 1.9.3

2 2

[anaconda:master 0/2] Some patches for formats package (anaconda part)
by Anne Mulhern 07 Jan '15

07 Jan '15

The blivet-side patches were updated to remove the definition of DirtyFSError in errors.py as it is no longer used anywhere in blivet after the application of the other patches. Otherwise there was no change. These patches will require updating required blivet version as well. mulhern (2): Remove allowDirty parameter from mountExistingSystem() call. Remove DirtyFSError related callbacks and entries. pyanaconda/errors.py | 10 ---- pyanaconda/rescue.py | 133 +++++++++++++++++++++++---------------------------- 2 files changed, 60 insertions(+), 83 deletions(-) -- 1.9.3

3 4

[anaconda][rhel7] Fix 1164191, 1138370, 1167375
by David Lehman 07 Jan '15

07 Jan '15

First two were tested by me. Third has already been validated on master. David Lehman (3): Don't try to use math.ceil on blivet.size.Size instances. (#1164191) Do not bypass name setters in the custom spoke. (#1138370) Fix handling of md fwraid names in kickstart bootloader command. pyanaconda/kickstart.py | 29 ++++++++++++++++++++++++---- pyanaconda/ui/gui/spokes/custom.py | 35 +++++++++++++++++++++++----------- pyanaconda/ui/gui/spokes/lib/resize.py | 19 +++++++++--------- 3 files changed, 58 insertions(+), 25 deletions(-) -- 1.9.3

2 6

[anaconda][master] master version of 1138370
by David Lehman 07 Jan '15

07 Jan '15

The custom spoke has changed quite a bit from rhel7-branch. David Lehman (1): Do not bypass name setters in the custom spoke. (#1138370) pyanaconda/ui/gui/spokes/custom.py | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) -- 1.9.3

2 2

[rhel7/master] Use a backslash to escape nfs spaces instead of x20 (#1109933)
by Brian C. Lane 07 Jan '15

07 Jan '15

Flags replaces \x20 on the cmdline with _ (for use with devices that have spaces in their names, _ is equivelant). But this breaks nfs paths with spaces. Use '\ ' instead so that Flags will leave it alone. Related: rhbz#1109933 --- dracut/parse-kickstart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index bcde770..304512e 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -74,8 +74,8 @@ class NFS(commands.nfs.FC6_NFS): else: method="nfs:%s:%s" % (self.server, self.dir) - # Spaces on the cmdline need to be \x20 - method = method.replace(" ", "\\x20") + # Spaces on the cmdline need to be '\ ' + method = method.replace(" ", "\\ ") return "inst.repo=%s" % method class URL(commands.url.F18_Url): -- 1.9.3

2 1

[PATCH 0/4] unsetup dnf repos and other payload changes
by David Shea 07 Jan '15

07 Jan '15

Patches 1 and 2 are just cleanups of unneeded code. Patch 3 handles the problem of accessing dnf payload properties before there's a payload to access by leaving empty data in unsetup payloads. This is kind of like all of those if not self._yumGroups lines in yumpayload.py, but not half a dozen places. Patch 4 makes dnfpayload not crash is the base repo can't be setup, because that's really uncalled for. David Shea (4): Remove obsolete packaging code. Remove the checks for whether dnf and rpm were imported Make dnf._base and dnf._base.comps always available. Don't treat the baserepo as special when gathering metadata (#1177502) pyanaconda/install.py | 2 +- pyanaconda/packaging/__init__.py | 56 +++----------------------------- pyanaconda/packaging/dnfpayload.py | 15 +++++---- pyanaconda/packaging/rpmostreepayload.py | 2 +- pyanaconda/packaging/yumpayload.py | 8 ++--- 5 files changed, 19 insertions(+), 64 deletions(-) -- 2.1.0

2 5

[blivet][rhel7] cherry-pick to fix 1167233
by David Lehman 06 Jan '15

06 Jan '15

Alexander Lakhin (1): Avoid exception when aligned start and end are crossed over blivet/partitioning.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 1.9.3

2 2

[master/rhel7] runtime-cleanup.tmpl: keep virtio-rng (#1179000)
by Brian C. Lane 06 Jan '15

06 Jan '15

From: Laszlo Ersek <lersek(a)redhat.com> Virtual machines easily get starved for randomness, and Anaconda insists on sufficient amounts of entropy when the user requests LUKS disk encryption. As a result, such installations can hang until Anaconda gives up (after 10 minutes) and makes do with whatever entropy is available. The virtualization host can feed randomness to the guest, unblocking the installation. However, the guest can only consume that randomness through the virtio-rng module. Let's not remove that module. Signed-off-by: Laszlo Ersek <lersek(a)redhat.com> Signed-off-by: Brian C. Lane <bcl(a)redhat.com> Resolves: rhbz#1179000 --- share/runtime-cleanup.tmpl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl index a5507b8..2a0aeeb 100644 --- a/share/runtime-cleanup.tmpl +++ b/share/runtime-cleanup.tmpl @@ -91,7 +91,15 @@ arch/x86/kvm %endfor remove lib/modules/*/{build,source,*.map} ## Need to keep virtio_console.ko and ipmi stuff in drivers/char -runcmd chroot ${root} find /lib/modules -regex ".*/kernel/drivers/char/.*" \! -name virtio_console.ko\* \! -name ipmi* -delete +## Also keep virtio-rng so that the installer can get sufficient randomness for +## LUKS setup. +runcmd chroot ${root} find /lib/modules \ + -regex ".*/kernel/drivers/char/.*" \ + \! -name virtio_console.ko\* \ + \! -name hw_random \ + \! -name virtio-rng.ko\* \ + \! -name ipmi\* \ + -delete ## NOTE: depmod gets re-run after cleanup finishes ## remove unused themes, theme engines, icons, etc. -- 1.9.3

3 3

[master] Fix for addon-defined categories plus a minor fix
by Vratislav Podzimek 06 Jan '15

06 Jan '15

The PATCH 2/2 fixes issues with addon-defined categories no longer working after we unified the GUI and TUI categories. Vratislav Podzimek (2): Remove an unused import in pyanaconda/ui/__init__.py Expect addons to have categories for both GUI and TUI pyanaconda/addons.py | 6 +++--- pyanaconda/ui/__init__.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.1.0

2 3

Patches for CentOS + Anaconda
by Colin Walters 06 Jan '15

06 Jan '15

I didn't write these patches, but I'm forwarding them here because: 1) I see no reason they shouldn't be upstream, now that CentOS is part of the family 2) We're trying to ship Atomic CentOS, and without these patches, important things like the EFI variable break See: https://git.centos.org/tree/!!!!rpms!anaconda.git/84445803224cd926e73643ee3…

2 4

[anaconda][rhel7-branch][PATCH] Tick the radio button for environments selected in kickstart (#1087831)
by Martin Kolman 06 Jan '15

06 Jan '15

Previously the environment was only highlighted, but its radio button was not ticked. Related: rhbz#1087831 Signed-off-by: Martin Kolman <mkolman(a)redhat.com> --- pyanaconda/ui/gui/spokes/software.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py index 6f94d50..0cfe61b 100644 --- a/pyanaconda/ui/gui/spokes/software.py +++ b/pyanaconda/ui/gui/spokes/software.py @@ -282,6 +282,7 @@ class SoftwareSelectionSpoke(NormalSpoke): self.environment = environment sel = self.builder.get_object("environmentSelector") sel.select_iter(itr) + self._environmentStore[itr][0] = True # tick the radio button firstEnvironment = False -- 1.9.3

2 1

[hello-world-addon] Adapt the HelloWorld addon to changes in Anaconda
by Vratislav Podzimek 06 Jan '15

06 Jan '15

Sending just to let you guys know what needs to be changed in the addons in case somebody asks. Vratislav Podzimek (4): Adapt to unified GUI+TUI categories Adapt to new way to get target root path Adapt to new way lightboxing works in anaconda Update the .glade file for the HelloWorld spoke org_fedora_hello_world/categories/__init__.py | 1 + org_fedora_hello_world/categories/hello_world.py | 40 ++++++++++++++++++++++ org_fedora_hello_world/gui/categories/__init__.py | 1 - .../gui/categories/hello_world.py | 40 ---------------------- .../gui/spokes/hello_world.glade | 8 ++--- org_fedora_hello_world/gui/spokes/hello_world.py | 5 ++- org_fedora_hello_world/ks/hello_world.py | 4 +-- org_fedora_hello_world/tui/spokes/hello_world.py | 10 +++--- 8 files changed, 54 insertions(+), 55 deletions(-) create mode 100644 org_fedora_hello_world/categories/__init__.py create mode 100644 org_fedora_hello_world/categories/hello_world.py delete mode 100644 org_fedora_hello_world/gui/categories/__init__.py delete mode 100644 org_fedora_hello_world/gui/categories/hello_world.py -- 2.1.0

1 4

[master] Wait for payload thread in TUI software spoke. (#1178214)
by Samantha N. Bueno 06 Jan '15

06 Jan '15

We should wait for this to finish before attempting to access any of the data from the dnf payload, otherwise a traceback will occur. --- pyanaconda/ui/tui/spokes/software.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/tui/spokes/software.py b/pyanaconda/ui/tui/spokes/software.py index ce069c9..eedc74b 100644 --- a/pyanaconda/ui/tui/spokes/software.py +++ b/pyanaconda/ui/tui/spokes/software.py @@ -57,7 +57,6 @@ class SoftwareSpoke(NormalTUISpoke): def showable(self): return isinstance(self.payload, PackagePayload) - @property def status(self): """ Where we are in the process """ @@ -107,6 +106,8 @@ class SoftwareSpoke(NormalTUISpoke): """ Refresh screen. """ NormalTUISpoke.refresh(self, args) + threadMgr.wait(THREAD_PAYLOAD) + if not self.payload.baseRepo: message = TextWidget(_("Installation source needs to be set up first.")) self._window.append(message) @@ -128,7 +129,6 @@ class SoftwareSpoke(NormalTUISpoke): name = self.payload.environmentDescription(env)[0] displayed.append(CheckboxWidget(title="%s" % name, completed=(environments.index(env) == self._selection))) - print(_("Base environment")) def _prep(i, w): """ Do some format magic for display. """ -- 1.8.3.1

3 4

[rhel7-cherry-pick] Allow adding prepboot to a blank disk in custom (#1176829)
by Brian C. Lane 06 Jan '15

06 Jan '15

On systems where the stage1 device can only be a partition (PPC for example) the self.data.bootloader.bootDrive isn't setup until you add a prepboot partition. If you start with a totally blank disk and added a prepboot partition first the accordion wouldn't be populated, resulting in a traceback. This changes custom to allow biosboot and prepboot to be added when self.data.bootloader.bootDrive hasn't been setup yet. This would also happen on UEFI when adding biosboot or prepboot as the first partition to a blank disk. (cherry picked from commit 007ed7454afb2beeba0670ab7f5009cb4ff6d8a5) Resolves: rhbz#1176829 --- pyanaconda/ui/gui/spokes/custom.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 35507f2..77ca0f2 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -951,8 +951,10 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): if device.format.type not in format_types: continue - disk_names = [d.name for d in device.disks] - if self.data.bootloader.bootDrive in disk_names: + disk_names = (d.name for d in device.disks) + # bootDrive may not be setup because it IS one of these. + if not self.data.bootloader.bootDrive or \ + self.data.bootloader.bootDrive in disk_names: devices.append(device) return devices -- 1.9.3

2 1

[PATCH anaconda master] Remove old workaround for missing EFI bits.
by d.marlin 05 Jan '15

05 Jan '15

From: "d.marlin" <dmarlin(a)redhat.com> The required EFI bits and the shim package are now built and functional for AArch64, so remove the previous workaround. Signed-off-by: David A. Marlin <dmarlin(a)redhat.com> --- pyanaconda/bootloader.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index c14f051..ac9ac5c 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1776,15 +1776,9 @@ class EFIGRUB(GRUB2): def check(self): return True -# FIXME: We need to include grubby, and omit the shim package -# on aarch64 until we get all the EFI bits in place. class Aarch64EFIGRUB(EFIGRUB): - packages = ["grub2-efi", "efibootmgr", "grubby"] - _serial_consoles = ["ttyAMA", "ttyS"] - _efi_binary = "\\grubaa64.efi" - class MacEFIGRUB(EFIGRUB): def mactel_config(self): if os.path.exists(iutil.getSysroot() + "/usr/libexec/mactel-boot-setup"): -- 1.8.3.1

2 1

[blivet:master 03/18] Do not compare the same two values twice.
by Anne Mulhern 05 Jan '15

05 Jan '15

If x and y are Sizes, not (x < y) implies x >= y. Write out the formula the if-statement implements in a comment, in case readers of the code do not understand the semantics of elif or Size(). Signed-off-by: mulhern <amulhern(a)redhat.com> --- blivet/devicelibs/swap.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/blivet/devicelibs/swap.py b/blivet/devicelibs/swap.py index bcc0308..93ae64e 100644 --- a/blivet/devicelibs/swap.py +++ b/blivet/devicelibs/swap.py @@ -142,14 +142,20 @@ def swapSuggestion(quiet=False, hibernation=False, disk_space=None): eight_GiB = Size("8GiB") sixtyfour_GiB = Size("64 GiB") - #chart suggested in the discussion with other teams + # the succeeding if-statement implements the following formula for + # suggested swap size. + # + # swap(mem) = 2 * mem, if mem < 2 GiB + # = mem, if 2 GiB <= mem < 8 GiB + # = mem / 2, if 8 GIB <= mem < 64 GiB + # = 4 GiB, if mem >= 64 GiB if mem < two_GiB: swap = 2 * mem - elif two_GiB <= mem < eight_GiB: + elif mem < eight_GiB: swap = mem - elif eight_GiB <= mem < sixtyfour_GiB: + elif mem < sixtyfour_GiB: swap = mem / 2 else: -- 1.9.3

2 1

[PATCH 1/2 livemedia-creator atomic] Add --make-pxe-live target and --ostree flag for Atomic Host.
by Radek Vykydal 05 Jan '15

05 Jan '15

Generate live squashfs and initrd for pxe live install. Also generate pxe config template. To be used with virt installation with /boot on separate partition (the only way supported by Anaconda currently). Content of boot partition is added to live root fs so that ostree can find deployment by boot configuration. --ostree flag ensures using deployment root instead of physical root of installed disk image where needed. --- docs/rhel-atomic-pxe-live.ks | 39 +++++++ src/sbin/livemedia-creator | 238 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 274 insertions(+), 3 deletions(-) create mode 100644 docs/rhel-atomic-pxe-live.ks diff --git a/docs/rhel-atomic-pxe-live.ks b/docs/rhel-atomic-pxe-live.ks new file mode 100644 index 0000000..324dad2 --- /dev/null +++ b/docs/rhel-atomic-pxe-live.ks @@ -0,0 +1,39 @@ +# Kickstart to be used to genrate pxe to live atomic image using --pxe-to-live and --ostree options +lang en_US.UTF-8 +keyboard us +timezone America/New_York +clearpart --all --initlabel +network --bootproto=dhcp --device=link --activate +rootpw --plaintext atomic + +# We are only able to install atomic with separate /boot partition currently +part / --fstype="ext4" --size=6000 +part /boot --size=500 --fstype="ext4" + +shutdown + +services --disabled=cloud-init,cloud-init-local,cloud-final,cloud-config,docker-storage-setup + +# Regenerating initramfs requires dracut-network package in repo, relabeling rootfs requires policycoreutils +#ostreesetup --osname=rhel-atomic-host --remote=rhel-atomic-host --url=http://10.34.102.90:8000/repo --ref=rhel-atomic-host/7.0-buildmaster/x86_64/standard --nogpg +ostreesetup --osname=rhel-atomic-host --remote=rhel-atomic-host --url=http://10.34.102.90:8000/repo --ref=rhel-atomic-host/7.0-buildmaster/x86_64/live-selinux --nogpg + +# We throw away separate /boot partition when building live squashfs image, +# and we don't want systemd to try to mount it when pxe booting +%post +cat /dev/null > /etc/fstab +%end + +# This comes from interactive-defaults.ks of installer.iso with included ostree repo +%post --erroronfail +rm -f /etc/ostree/remotes.d/rhel-atomic-host.conf +%end + +# This comes from interactive-defaults.ks of installer.iso with included ostree repo +%post --erroronfail +rm -f /etc/ostree/remotes.d/*.conf +echo 'unconfigured-state=This system is not registered to Red Hat Subscription Management. You can use subscription-manager to register.' >> $(ostree admin --print-current-dir).origin +%end + + + diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index e25d422..e25291c 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -37,6 +37,7 @@ import shutil import argparse import hashlib import re +import glob # Use pykickstart to calculate disk image size from pykickstart.parser import KickstartParser @@ -52,9 +53,9 @@ from pylorax.treebuilder import TreeBuilder, RuntimeBuilder, udev_escape from pylorax.treebuilder import findkernels from pylorax.sysutils import joinpaths, remove from pylorax.imgutils import PartitionMount, mksparse, mkext4img, loop_detach -from pylorax.imgutils import get_loop_name, dm_detach, mount, umount, Mount +from pylorax.imgutils import get_loop_name, dm_detach, mount, umount, Mount, LoopDev from pylorax.imgutils import mksquashfs, mkqcow2, mktar -from pylorax.executils import execWithRedirect, execWithCapture +from pylorax.executils import execWithRedirect, execWithCapture, runcmd # no-virt mode doesn't need libvirt, so make it optional try: @@ -414,6 +415,21 @@ def is_image_mounted(disk_img): return True return False +def find_ostree_root(phys_root): + """ + Find root of ostree deployment + + :param str phys_root: Path to physical root + :returns: Relative path of ostree deployment root + :rtype: str + """ + ostree_root = "" + ostree_sysroots = glob.glob(joinpaths(phys_root, "ostree/boot.0/*/*/0")) + if ostree_sysroots: + if len(ostree_sysroots) > 1: + log.error("Too many deployment roots found: %s" % ostree_sysroots) + ostree_root = os.path.relpath(ostree_sysroots[0], phys_root) + return ostree_root def get_arch(mount_dir): """ @@ -499,7 +515,6 @@ def make_fsimage(diskimage, fsimage, img_size=None, label="Anaconda"): mkext4img(img_mount.mount_dir, fsimage, size=img_size, label=label) - def make_runtime(opts, mount_dir, work_dir): """ Make the squashfs image from a directory @@ -527,6 +542,118 @@ def make_runtime(opts, mount_dir, work_dir): log.info("Creating runtime") rb.create_runtime(joinpaths(work_dir, RUNTIME), size=None) +def make_live_rootfs(mount_dir, image_path, size=2, sys_root=""): + """ + Make rootfs image from a directory + + :param str mount_dir: Root directory + :param str image_path: Path of output image file + :param int size: Size of the image, if None computed automatically + :param str sys_root: path to system (deployment) root relative to physical root + """ + if size: + fssize = size * (1024*1024*1024) # 2GB sparse file compresses down to nothin' + else: + fssize = None # Let mkext4img figure out the needed size + + mkext4img(mount_dir, image_path, label="LiveOS", size=fssize) + # Reset selinux context on new rootfs + with LoopDev(image_path) as loopdev: + with Mount(loopdev) as mnt: + cmd = [ "setfiles", "-e", "/proc", "-e", "/sys", "-e", "/dev", "-e", "/install", + "/etc/selinux/targeted/contexts/files/file_contexts", "/"] + root = joinpaths(mnt, sys_root.lstrip("/")) + runcmd(cmd, root=root) + +def rebuild_initrds_for_live(opts, sys_root_dir, results_dir): + """ + Rebuild intrds for pxe live image (root=live:http://) + + :param opts: options passed to livemedia-creator + :type opts: argparse options + :param str sys_root_dir: Path to root of the system + :param str results_dir: Path of directory for storing results + """ + if not opts.dracut_args: + dracut_args = DRACUT_DEFAULT + else: + dracut_args = [] + for arg in opts.dracut_args: + dracut_args += arg.split(" ", 1) + log.info("dracut args = {0}".format(dracut_args)) + + dracut = ["dracut", "--nomdadmconf", "--nolvmconf"] + dracut_args + + kdir = "boot" + if opts.ostree: + kernels_dir = glob.glob(joinpaths(sys_root_dir, "boot/ostree/*"))[0] + kdir = os.path.relpath(kernels_dir, sys_root_dir) + + kernels = [kernel for kernel in findkernels(sys_root_dir, kdir) + if hasattr(kernel, "initrd")] + if not kernels: + raise Exception("No initrds found, cannot rebuild_initrds") + + # Hush some dracut warnings. TODO: bind-mount proc in place? + open(joinpaths(sys_root_dir,"/proc/modules"),"w") + + if opts.ostree: + # Dracut assumes to have some dirs in disk image + # /var/tmp for temp files + vartmp_dir = joinpaths(sys_root_dir, "var/tmp") + if not os.path.isdir(vartmp_dir): + os.mkdir(vartmp_dir) + # /root (maybe not fatal) + root_dir = joinpaths(sys_root_dir, "var/roothome") + if not os.path.isdir(root_dir): + os.mkdir(root_dir) + # /tmp (maybe not fatal) + tmp_dir = joinpaths(sys_root_dir, "sysroot/tmp") + if not os.path.isdir(tmp_dir): + os.mkdir(tmp_dir) + + for kernel in kernels: + + outfile = kernel.initrd.path + ".live" + log.info("rebuilding %s", outfile) + + kver = kernel.version + + cmd = dracut + [outfile, kver] + runcmd(cmd, root=sys_root_dir) + + new_initrd_path = joinpaths(results_dir, os.path.basename(kernel.initrd.path)) + shutil.move(joinpaths(sys_root_dir, outfile), new_initrd_path) + shutil.copy2(joinpaths(sys_root_dir, kernel.path), results_dir) + + os.unlink(joinpaths(sys_root_dir,"/proc/modules")) + +def create_pxe_config(images_dir, live_image_name, add_args = None): + """ + Create template for pxe to live configuration + + :param str images_dir: Path of directory with images to be used + :param str live_image_name: Name of live rootfs image file + :param list add_args: Arguments to be added to initrd= pxe config + """ + + add_args = add_args or [] + + kernels = [kernel for kernel in findkernels(images_dir, kdir="") + if hasattr(kernel, "initrd")] + if not kernels: + return + + kernel = kernels[0] + + add_args_str = " ".join(add_args) + + buf = """# PXE configuration template generated by livemedia-creator +kernel <PXE_DIR>%s +append initrd=<PXE_DIR>%s root=live:<URL>/%s %s +""" % (kernel.path, kernel.initrd.path, live_image_name, add_args_str) + with open (joinpaths(images_dir, "PXE_CONFIG"), "w") as f: + f.write(buf) def make_livecd(opts, mount_dir, work_dir): """ @@ -588,6 +715,34 @@ def make_livecd(opts, mount_dir, work_dir): return work_dir +def mount_boot_part_over_root(img_mount): + """ + Mount boot partition to /boot of root fs mounted in img_mount + + Used for OSTree so it finds deployment configurations on live rootfs + + param img_mount: object with mounted disk image root partition + type img_mount: imgutils.PartitionMount + """ + root_dir = img_mount.mount_dir + is_boot_part = lambda dir: os.path.exists(dir+"/loader.0") + tmp_mount_dir = tempfile.mkdtemp() + sys_root = find_ostree_root(root_dir) + sys_root_bootdir = None + for dev, size in img_mount.loop_devices: + try: + mount("/dev/mapper/"+dev, mnt=tmp_mount_dir) + if is_boot_part(tmp_mount_dir): + umount(tmp_mount_dir) + sysroot_boot_dir = joinpaths(joinpaths(root_dir, sys_root), "boot") + mount("/dev/mapper/"+dev, mnt=sysroot_boot_dir) + break + else: + umount(tmp_mount_dir) + except subprocess.CalledProcessError as e: + log.debug("Looking for boot partition error: %s", e) + remove(tmp_mount_dir) + return sysroot_boot_dir def novirt_install(opts, disk_img, disk_size, repo_url): """ @@ -840,6 +995,52 @@ def make_image(opts, ks): log.info("Disk Image install successful") return disk_img +def make_live_images(opts, work_dir, root_dir, rootfs_image=None): + """ + Create live images from direcory or rootfs image + + :param opts: options passed to livemedia-creator + :type opts: argparse options + :param str work_dir: Directory for storing results + :param str root_dir: Root directory of live filesystem tree + :param str rootfs_image: Path to live rootfs image to be used + :returns: Path of directory with created images + :rtype: str + """ + sys_root = "" + if opts.ostree: + sys_root = find_ostree_root(root_dir) + + squashfs_root_dir = joinpaths(work_dir, "squashfs_root") + liveos_dir = joinpaths(squashfs_root_dir, "LiveOS") + os.makedirs(liveos_dir) + + if rootfs_image: + rc = execWithRedirect("/bin/ln", [rootfs_image, joinpaths(liveos_dir, "rootfs.img")]) + if rc != 0: + shutil.copy2(rootfs_image, joinpaths(liveos_dir, "rootfs.img")) + else: + log.info("Creating live rootfs image") + make_live_rootfs(root_dir, joinpaths(liveos_dir, "rootfs.img"), size=None, sys_root=sys_root) + + log.info("Packing live rootfs image") + add_pxe_args = [] + live_image_name = "live-rootfs.squashfs.img" + mksquashfs(squashfs_root_dir, + joinpaths(work_dir, live_image_name), + opts.compression, + opts.compress_args) + + remove(squashfs_root_dir) + + log.info("Rebuilding initramfs for live") + rebuild_initrds_for_live(opts, joinpaths(root_dir, sys_root), work_dir) + + if opts.ostree: + add_pxe_args.append("ostree=/%s" % sys_root) + create_pxe_config(work_dir, live_image_name, add_pxe_args) + + return work_dir def setup_logging(opts): """ @@ -892,6 +1093,8 @@ def main(): help="Build an ami image") action.add_argument("--make-tar", action="store_true", help="Build a tar of the root filesystem") + action.add_argument("--make-pxe-live", action="store_true", + help="Build live in squashfs and initrd for pxe boot") parser.add_argument("--iso", type=os.path.abspath, help="Anaconda installation .iso path to use for virt-install") @@ -914,6 +1117,9 @@ def main(): help="location of iso directory tree with initrd.img " "and vmlinuz. Used to run virt-install with a " "newer initrd than the iso.") + parser.add_argument("--ostree", action="store_true", + help="Ostree (Atomic) installation") + parser.add_argument("--logfile", default="./livemedia.log", type=os.path.abspath, @@ -1165,6 +1371,32 @@ def main(): make_appliance(opts.disk_image or disk_img, opts.app_name, opts.app_template, opts.app_file, networks, opts.ram, opts.vcpus, opts.arch, opts.title, opts.project, opts.releasever) + elif opts.make_pxe_live: + + work_dir = tempfile.mkdtemp() + log.info("working dir is {0}".format(work_dir)) + + if (opts.fs_image or opts.no_virt) and not opts.disk_image: + # Create pxe live images from a filesystem image + disk_img = opts.fs_image or disk_img + with Mount(disk_img, opts="loop") as mnt_dir: + result_dir = make_live_images(opts, work_dir, mnt_dir, rootfs_image=disk_img) + else: + # Create pxe live images from a partitioned disk image + disk_img = opts.disk_image or disk_img + is_root_part = None + if opts.ostree: + is_root_part = lambda dir: os.path.exists(dir+"/ostree/deploy") + with PartitionMount(disk_img, mount_ok=is_root_part) as img_mount: + if img_mount and img_mount.mount_dir: + + mounted_sysroot_boot_dir = None + if opts.ostree: + mounted_sysroot_boot_dir = mount_boot_part_over_root(img_mount) + + result_dir = make_live_images(opts, work_dir, img_mount.mount_dir) + if mounted_sysroot_boot_dir: + umount(mounted_sysroot_boot_dir) if opts.result_dir and result_dir: shutil.copytree(result_dir, opts.result_dir) -- 1.9.3

2 3

[blivet:master] Simple patch for #1172172
by Anne Mulhern 05 Jan '15

05 Jan '15

The alternative is to update LVMLogicalVolumeDevice.updateKSData() so that it records a size for an existing device. I think I prefer the alternative I've posted, but it is a little hard to tell given how long and puzzling LogVolData.execute() is. mulhern (1): If using pre-existing, no size needs to be specified in ksdata (#1172172) pyanaconda/kickstart.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.3

2 2

[rhel6-branch] Detect and show a warning for LDL DASDs. (#1144979)
by Samantha N. Bueno 05 Jan '15

05 Jan '15

Check if any of the DASDs on an s390x system are LDL formatted. If they are, show a warning to users and give them the option to run dasdfmt against them, which will (re-)format them as CDL DASDs. Resolves: rhbz#1144979 --- installinterfacebase.py | 4 ++-- storage/dasd.py | 21 +++++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/installinterfacebase.py b/installinterfacebase.py index d4f20fa..6d454e0 100644 --- a/installinterfacebase.py +++ b/installinterfacebase.py @@ -80,12 +80,12 @@ class InstallInterfaceBase(object): title = P_("Unformatted DASD Device Found", "Unformatted DASD Devices Found", c) msg = P_("Format uninitialized DASD device?\n\n" - "There is %d uninitialized DASD device on this " + "There is %d uninitialized or LDL DASD device on this " "system. To continue installation, the device must " "be formatted. Formatting will remove any data on " "this device." % c, "Format uninitialized DASD devices?\n\n" - "There are %d uninitialized DASD devices on this " + "There are %d uninitialized or LDL DASD devices on this " "system. To continue installation, the devices must " "be formatted. Formatting will remove any data on " "these devices." % c, diff --git a/storage/dasd.py b/storage/dasd.py index 3a20b16..1576048 100644 --- a/storage/dasd.py +++ b/storage/dasd.py @@ -20,6 +20,7 @@ # import iutil +import isys import sys import os from storage.errors import DasdFormatError @@ -59,6 +60,9 @@ class DASD: def startup(self, intf, exclusiveDisks, zeroMbr): """ Look for any unformatted DASDs in the system and offer the user the option for format them with dasdfmt or exit the installer. + + Also check if any DASDs are LDL formatted and show a warning to + users, since these disks will not be usable during installation. """ if self.started: return @@ -73,7 +77,7 @@ class DASD: # Trigger udev data about the dasd devices on the system udev_trigger(action="change", name="dasd*") - log.info("Checking for unformatted DASD devices:") + log.info("Checking for unformatted and LDL DASD devices:") for device in os.listdir("/sys/block"): if not device.startswith("dasd"): @@ -87,18 +91,23 @@ class DASD: status = f.read().strip() f.close() - if status in ["unformatted"] and device not in exclusiveDisks: - bypath = deviceNameToDiskByPath(device) - if not bypath: - bypath = "/dev/" + device + bypath = deviceNameToDiskByPath(device) + if not bypath: + bypath = "/dev/" + device + if status in ["unformatted"] and device not in exclusiveDisks: log.info(" %s (%s) status is %s, needs dasdfmt" % (device, bypath, status,)) self._dasdlist.append((device, bypath)) + elif isys.isLdlDasd(device): + log.info(" %s (%s) is an LDL DASD, needs dasdfmt" % (device, + bypath)) + self._dasdlist.append((device, bypath)) + if not len(self._dasdlist): - log.info(" no unformatted DASD devices found") + log.info(" no unformatted or LDL DASD devices found") return askUser = True -- 1.9.3

2 1

[PATCH] Mount efivarfs under /mnt/sysimage on appropriate platforms
by Peter Jones 02 Jan '15

02 Jan '15

Bug 1129435 was fixed in the efibootmgr code, but that code only works if we've got the newer kernel interface available, which requires mounting it. If we don't mount it, we hit the old code path, which doesn't allow us to create device paths > 1024 bytes. Signed-off-by: Peter Jones <pjones(a)redhat.com> --- blivet/__init__.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/blivet/__init__.py b/blivet/__init__.py index 210d3c6..2c8d26b 100644 --- a/blivet/__init__.py +++ b/blivet/__init__.py @@ -85,6 +85,7 @@ from . import util from . import arch from .flags import flags from .platform import platform as _platform +from .platform import EFI from .size import Size from .i18n import _ @@ -2260,6 +2261,7 @@ class FSSet(object): self._devshm = None self._usb = None self._selinux = None + self._efivars = None self._run = None self._fstab_swaps = set() self.preserveLines = [] # lines we just ignore and preserve @@ -2310,6 +2312,12 @@ class FSSet(object): return self._selinux @property + def efivars(self): + if not self._efivars: + self._efivars = NoDevice(fmt=getFormat("efivarfs", device="efivarfs", mountpoint="/sys/firmware/efi/efivars")) + return self._efivars + + @property def run(self): if not self._run: self._run = DirectoryDevice("/run", @@ -2386,7 +2394,8 @@ class FSSet(object): device=device.path, exists=True) elif mountpoint in ("/proc", "/sys", "/dev/shm", "/dev/pts", - "/sys/fs/selinux", "/proc/bus/usb"): + "/sys/fs/selinux", "/proc/bus/usb", + "/sys/firmware/efi/efivars"): # drop these now -- we'll recreate later return None else: @@ -2554,6 +2563,8 @@ class FSSet(object): devices = list(self.mountpoints.values()) + self.swapDevices devices.extend([self.dev, self.devshm, self.devpts, self.sysfs, self.proc, self.selinux, self.usb, self.run]) + if isinstance(_platform, EFI): + devices.append(self.efivars) devices.sort(key=lambda d: getattr(d.format, "mountpoint", None)) for device in devices: @@ -2611,6 +2622,8 @@ class FSSet(object): devices = list(self.mountpoints.values()) + self.swapDevices devices.extend([self.dev, self.devshm, self.devpts, self.sysfs, self.proc, self.usb, self.selinux, self.run]) + if isinstance(_platform, EFI): + devices.append(self.efivars) devices.sort(key=lambda d: getattr(d.format, "mountpoint", None)) devices.reverse() for device in devices: -- 2.1.0

3 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches January 2015