anaconda-patches June 2014

anaconda-patches@lists.fedorahosted.org

11 participants
108 discussions

[PATCH] rpmostreepayload: Don't recreateInitrds for this payload
by Colin Walters 07 Jul '14

07 Jul '14

I had this patch sitting locally, haven't had a chance to test it yet, sending it out so it's not lost and for early comment. The OSTree replication design has the initramfs generated on a compose server. Avoid regenerating them locally. --- pyanaconda/packaging/rpmostreepayload.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pyanaconda/packaging/rpmostreepayload.py b/pyanaconda/packaging/rpmostreepayload.py index 301da89..0710890 100644 --- a/pyanaconda/packaging/rpmostreepayload.py +++ b/pyanaconda/packaging/rpmostreepayload.py @@ -197,6 +197,12 @@ class RPMOSTreePayload(ArchivePayload): ["--create", "--boot", "--root=" + iutil.getSysroot(), "--prefix=/var/" + varsubdir]) + def recreateInitrds(self, force=False): + # For rpmostree payloads, we're replicating an initramfs from + # a compose server, and should never be regenerating them + # per-machine. + pass + def postInstall(self): super(RPMOSTreePayload, self).postInstall() -- 1.8.3.1

2 2

[PATCH 00/10+1] single window GUI, take 2
by David Shea 02 Jul '14

02 Jul '14

Changes since last time: - Fixed the stuff that Vratislav pointed out: * Added a macro for the sidebar width percentage * Changed finalize to dispose since that's more in the spirit of reference releases * Fixed a couple of comments * Changed Spoke._visitedSinceApplied to a public property * Added MainWindow to ANACONDA_WINDOW_GROUP. Added the exception window to it, too, since there is no longer a separate Gtk.main loop for spokes and no separate spoke window to get stuck under. - Fixed makeupdates to work with the widgets version increase - Increased the version of the .gir and .typelib files too since that seems like the thing to do - Replaced the lightbox with something hopefully less fragile - Removed the resize on realize part from MainWindow since it turns out it didn't actually work - Updated initial-setup for the new HubWindow - Added a couple more deprecation warning ignores since I apparently I missed some last time David Shea (10): Add a couple more deprecation warning ignores Remove the custom accelerators from custom storage. Use globs for the anaconda widgets library paths Increased the version of anaconda-widgets to 3.0 Add a class BaseStandalone. Add a window to manage Anaconda screen transitions. Add a delete-event handler for the main window Added a method to create new GdkPixbufs from in-memory data Implement the lightbox in MainWindow Remove the Lightbox widget po/POTFILES.in | 2 +- pyanaconda/ui/common.py | 2 +- pyanaconda/ui/gui/__init__.py | 212 ++++++++++-- pyanaconda/ui/gui/hubs/__init__.py | 91 ++--- pyanaconda/ui/gui/hubs/progress.glade | 5 +- pyanaconda/ui/gui/hubs/progress.py | 11 +- pyanaconda/ui/gui/hubs/summary.glade | 6 +- pyanaconda/ui/gui/hubs/summary.py | 7 - pyanaconda/ui/gui/spokes/__init__.py | 19 +- pyanaconda/ui/gui/spokes/custom.glade | 3 +- pyanaconda/ui/gui/spokes/custom.py | 24 +- pyanaconda/ui/gui/spokes/datetime_spoke.py | 4 +- pyanaconda/ui/gui/spokes/filter.py | 7 +- pyanaconda/ui/gui/spokes/keyboard.py | 8 +- .../ui/gui/spokes/lib/custom_storage_helpers.glade | 1 - pyanaconda/ui/gui/spokes/network.py | 8 +- pyanaconda/ui/gui/spokes/software.py | 4 +- pyanaconda/ui/gui/spokes/source.py | 10 +- pyanaconda/ui/gui/spokes/storage.py | 8 +- pyanaconda/ui/gui/spokes/user.py | 3 +- pyanaconda/ui/gui/spokes/welcome.py | 10 +- pyanaconda/ui/gui/tools/run-spoke.py | 7 +- pyanaconda/ui/gui/utils.py | 15 +- scripts/makeupdates | 12 +- widgets/configure.ac | 2 +- widgets/doc/AnacondaWidgets-docs.xml | 2 +- widgets/glade/AnacondaWidgets.xml | 13 +- widgets/src/BaseStandalone.c | 377 +++++++++++++++++++++ widgets/src/BaseStandalone.h | 81 +++++ widgets/src/BaseWindow.c | 14 +- widgets/src/BaseWindow.h | 6 +- widgets/src/HubWindow.c | 94 +---- widgets/src/HubWindow.h | 6 +- widgets/src/LayoutIndicator.c | 2 + widgets/src/Lightbox.c | 360 -------------------- widgets/src/Lightbox.h | 67 ---- widgets/src/Makefile.am | 20 +- widgets/src/SpokeWindow.c | 29 +- widgets/src/StandaloneWindow.c | 242 +++---------- widgets/src/StandaloneWindow.h | 15 +- widgets/src/widgets-common.c | 51 ++- widgets/src/widgets-common.h | 3 + 42 files changed, 893 insertions(+), 970 deletions(-) create mode 100644 widgets/src/BaseStandalone.c create mode 100644 widgets/src/BaseStandalone.h delete mode 100644 widgets/src/Lightbox.c delete mode 100644 widgets/src/Lightbox.h -- 2.0.0

2 13

[master][PATCH] Use the right index for selecting region (#1114234)
by Vratislav Podzimek 01 Jul '14

01 Jul '14

'id' is a Python builtin, 'index' is a variable that is used as an index in that block of code. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/tui/spokes/time_spoke.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/ui/tui/spokes/time_spoke.py b/pyanaconda/ui/tui/spokes/time_spoke.py index 62a1b23..3995a70 100644 --- a/pyanaconda/ui/tui/spokes/time_spoke.py +++ b/pyanaconda/ui/tui/spokes/time_spoke.py @@ -104,7 +104,7 @@ class TimeZoneSpoke(FirstbootSpokeMixIn, NormalTUISpoke): self.apply() self.close() else: - self.app.switch_screen(self, self._regions[id]) + self.app.switch_screen(self, self._regions[index]) return INPUT_PROCESSED elif key.lower() == "b": self.app.switch_screen(self, None) -- 1.9.3

4 6

[libblockdev:master] Automating libblockdev project a bit
by Anne Mulhern 01 Jul '14

01 Jul '14

Even the Makefile itself is not really fully automatic and I haven't started on autotooling, but I'ld like to get this pushed before I have to rebase too many more times. mulhern (1): Make Makefile mostly automatic. Makefile | 155 +++++++++++++++++++++-------------------------- src/lib/blockdev.c | 11 ++-- src/lib/blockdev.h | 1 - src/lib/plugin_apis/dm.h | 2 +- src/plugins/loop.c | 2 +- src/plugins/lvm.c | 2 +- src/plugins/swap.c | 2 +- src/plugins/test_loop.c | 2 +- src/plugins/test_lvm.c | 3 +- src/plugins/test_swap.c | 2 +- src/utils/sizes.c | 2 +- src/utils/test_sizes.c | 2 +- 12 files changed, 82 insertions(+), 104 deletions(-) -- 1.9.3

3 5

[PATCH] Map our log levels to syslog log levels
by Brian C. Lane 01 Jul '14

01 Jul '14

It ends up that syslog doesn't understand levels like ERR and CRIT (and of course LOCK) so it maps them to WARNING instead of what they really mean. This checks for the ones anaconda adds and maps them to the appropriate syslog level. --- pyanaconda/anaconda_log.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pyanaconda/anaconda_log.py b/pyanaconda/anaconda_log.py index 1a48ea9..f7e36a5 100644 --- a/pyanaconda/anaconda_log.py +++ b/pyanaconda/anaconda_log.py @@ -67,6 +67,11 @@ def setHandlersLevel(logr, level): filter (lambda hdlr: hasattr(hdlr, "autoSetLevel") and hdlr.autoSetLevel, logr.handlers)) class AnacondaSyslogHandler(SysLogHandler): + # syslog doesn't understand these level names + levelMap = { "ERR": "error", + "CRIT": "critical", + "LOCK": "debug"} + def __init__(self, address=('localhost', SYSLOG_UDP_PORT), facility=SysLogHandler.LOG_USER, @@ -80,6 +85,10 @@ class AnacondaSyslogHandler(SysLogHandler): SysLogHandler.emit(self, record) record.msg = original_msg + def mapPriority(self, level): + """Map the priority level to a syslog level """ + return self.levelMap.get(level, SysLogHandler.mapPriority(self, level)) + class AnacondaLog: SYSLOG_CFGFILE = "/etc/rsyslog.conf" VIRTIO_PORT = "/dev/virtio-ports/org.fedoraproject.anaconda.log.0" -- 1.9.3

2 1

[lorax] livemedia-creator: catch failed retry error
by Brian C. Lane 01 Jul '14

01 Jul '14

Also drop looking for WARNING in the regex errors, they will be errors after the syslog level name remap patch goes into anaconda. --- src/sbin/livemedia-creator | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index 47eec2c..916eef0 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -143,9 +143,10 @@ class LogRequestHandler(SocketServer.BaseRequestHandler): simple_tests = ["Traceback (", "Out of memory:", "Call Trace:", - "insufficient disk space:"] - re_tests = [r"WARNING packaging: base repo .* not valid", - r"WARNING packaging: .* requires .*"] + "insufficient disk space:", + "error populating transaction after"] + re_tests = [r"packaging: base repo .* not valid", + r"packaging: .* requires .*"] for t in simple_tests: if t in line: self.server.log_error = True -- 1.9.3

2 1

[anaconda][master][Python 3][PATCH] Use createrepo_c
by Martin Kolman 01 Jul '14

01 Jul '14

As we are only calling the createrepo utility with the path to the folder containing the RPM files, no changes other than changing the command name when calling createrepo and changing the package name in the spec file should be needed. Martin Kolman (1): Use createrepo_c in place of createrepo anaconda.spec.in | 2 +- pyanaconda/packaging/yumpayload.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 1.9.3

4 6

[pungi] Don't emit media labels with spaces in them.
by Peter Jones 01 Jul '14

01 Jul '14

Spaces cause various bugs like #923374 and #855849 , and it would be better if we just didn't use them. Note that there's a corresponding lorax change to go with this. Signed-off-by: Peter Jones <pjones(a)redhat.com> --- src/pypungi/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py index 9e9d161..6c65bc9 100644 --- a/src/pypungi/__init__.py +++ b/src/pypungi/__init__.py @@ -1608,7 +1608,7 @@ class Pungi(pypungi.PungiBase): # NOTE: if this doesn't match what's in the bootloader config, the # image won't be bootable! extraargs.append('-V') - extraargs.append('%s %s %s' % (self.config.get('pungi', 'name'), + extraargs.append('%s-%s-%s' % (self.config.get('pungi', 'name'), self.config.get('pungi', 'version'), self.tree_arch)) extraargs.extend(['-o', isofile]) -- 1.9.3

2 1

[lorax] Don't emit media labels with spaces in them.
by Peter Jones 30 Jun '14

30 Jun '14

Spaces cause various bugs like #923374 and #855849 , and it would be better if we just didn't use them. Note that there's a corresponding pungi change to go with this. Signed-off-by: Peter Jones <pjones(a)redhat.com> --- share/live/x86.tmpl | 3 +++ share/x86.tmpl | 3 +++ src/pylorax/__init__.py | 2 +- src/sbin/livemedia-creator | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/share/live/x86.tmpl b/share/live/x86.tmpl index 522c873..eb67bbf 100644 --- a/share/live/x86.tmpl +++ b/share/live/x86.tmpl @@ -6,6 +6,9 @@ PXEBOOTDIR="images/pxeboot" BOOTDIR="isolinux" KERNELDIR=PXEBOOTDIR LIVEDIR="LiveOS" + +## Don't allow spaces or escape characters in the iso label +isolabel = ''.join(ch if ch.isalnum() else '-' for ch in isolabel) %> mkdir ${LIVEDIR} diff --git a/share/x86.tmpl b/share/x86.tmpl index a139596..cdd7477 100644 --- a/share/x86.tmpl +++ b/share/x86.tmpl @@ -6,6 +6,9 @@ PXEBOOTDIR="images/pxeboot" BOOTDIR="isolinux" KERNELDIR=PXEBOOTDIR LIVEDIR="LiveOS" + +## Don't allow spaces or escape characters in the iso label +isolabel = ''.join(ch if ch.isalnum() else '-' for ch in isolabel) %> mkdir ${LIVEDIR} diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index 952f08f..83f5286 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -242,7 +242,7 @@ class Lorax(BaseLoraxClass): # NOTE: if you change isolabel, you need to change pungi to match, or # the pungi images won't boot. - isolabel = volid or "{0.name} {0.version} {1.basearch}".format(self.product, + isolabel = volid or "{0.name}-{0.version}-{1.basearch}".format(self.product, self.arch) if len(isolabel) > 32: diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index 47eec2c..e5f4f77 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -557,7 +557,7 @@ def make_livecd(opts, mount_dir, work_dir): remove(fullpath) shutil.copytree(configdir, fullpath) - isolabel = opts.volid or "{0.name} {0.version} {1.basearch}".format(product, arch) + isolabel = opts.volid or "{0.name}-{0.version}-{1.basearch}".format(product, arch) if len(isolabel) > 32: isolabel = isolabel[:32] log.warn("Truncating isolabel to 32 chars: %s", isolabel) -- 1.9.3

2 1

[lorax] Remove biosdevname (#989209)
by Brian C. Lane 30 Jun '14

30 Jun '14

biosdevname has been replaced by systemd predictable network interface names. See https://fedoraproject.org/wiki/Features/SystemdPredictableNetworkInterfaceN… for more background and bug 965718 for discussion. --- share/runtime-install.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl index 403b845..2b23f9b 100644 --- a/share/runtime-install.tmpl +++ b/share/runtime-install.tmpl @@ -35,7 +35,7 @@ installpkg grubby installpkg efibootmgr grub2-efi shim shim-unsigned %endif %if basearch in ("i386", "x86_64"): - installpkg grub2 grub2-tools biosdevname memtest86+ syslinux syslinux-nonlinux + installpkg grub2 grub2-tools memtest86+ syslinux syslinux-nonlinux %endif %if basearch in ("ppc", "ppc64", "ppc64le"): installpkg grub2 grub2-tools fbset hfsutils kernel-bootwrapper ppc64-utils -- 1.9.3

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches June 2014