September 2013 - anaconda-patches - Fedora mailing-lists

[PATCH rhel7-branch] networking: ports from master + one new
by Radek Vykydal 11 Sep '13

11 Sep '13

[1/5] - [4/5] are straightforward ports from master [5/5] is a new one on top of them I think I need review only for [5/5].

3 8

[PATCH rhel6-branch] PPC: strengthen PReP-picking algorithm (#877852)
by Will Woods 11 Sep '13

11 Sep '13

pSeries-style systems can have multiple PReP partitions, as long as there's only one per disk. It's kind of like the x86 MBR that way. The current code in booty and platform.py *always* picks the first PReP partition, which will fail if if you have (e.g.) an OS already installed on /dev/sda and you're doing a new install onto /dev/sdb. This patch adds ppcBootloaderInfo.pickPReP(), which tries to find the best PReP partition to use according to the following rules: 1) If we're creating a new PReP partition, use that. 2) Otherwise, if there's a PReP partition already on the disk that contains /boot (or "any disk that contains /boot" if mdraid), use that. 3) Failing that, use the first available PReP partition (as before). This should make mkofboot actually install yaboot into the correct PReP partition. IPSeriesPPC.bootDevice() has been changed to use this same algorithm, so the two of them will agree about what the boot device is. ¹ If /boot is an mdraid device, check each of its member disks for a PReP partition, and return the first one found. --- booty/ppc.py | 38 +++++++++++++++++++++++++++++++++----- platform.py | 11 ++--------- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/booty/ppc.py b/booty/ppc.py index 6f62071..3fc5582 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -7,6 +7,36 @@ from bootloaderInfo import * import iutil class ppcBootloaderInfo(bootloaderInfo): + def pickPReP(self): + # if we created a new PReP partition, pick that + for a in self.storage.findActions(type="create", obj="format"): + if a.format.type == "prepboot": + return a.device + + # otherwise, look at the existing PReP partitions. + prepdevs = [] + for dev in self.storage.fsset.devices: + if (dev.format.type == "prepboot" and + dev.partedPartition.getFlag(parted.PARTITION_BOOT)): + prepdevs.append(dev) + + # (no PReP found? bail out.) + if len(prepdevs) == 0: + return None + + # we'd prefer a PReP partition that's on the same disk as /boot. + bootdev = self.storage.mountpoints.get("/boot",self.storage.rootDevice) + if bootdev.type == "mdarray": + bootdisks = set(p.disk for p in bootdev.parents) + else: + bootdisks = set([bootdev.disk]) + for dev in prepdevs: + if dev.disk in bootdisks: + return dev + + # failing that, return the first PReP partition we found + return prepdevs[0] + def getBootDevs(self, bl): import parted @@ -14,10 +44,9 @@ class ppcBootloaderInfo(bootloaderInfo): machine = iutil.getPPCMachine() if machine == 'pSeries': - for dev in self.storage.fsset.devices: - if (dev.format.type == "prepboot" and - dev.partedPartition.getFlag(parted.PARTITION_BOOT)): - retval.append(dev.path) + prep = self.pickPReP() + if prep: + retval.append(prep.path) elif machine == 'PMac': for dev in self.storage.fsset.devices: if dev.format.type == "hfs" and dev.format.bootable: @@ -31,7 +60,6 @@ class ppcBootloaderInfo(bootloaderInfo): except KeyError: # Try / if we don't have this we're not going to work device = self.storage.rootDevice - retval.append(device.path) else: if bl.getDevice(): diff --git a/platform.py b/platform.py index 7bc75ec..e866133 100644 --- a/platform.py +++ b/platform.py @@ -392,15 +392,8 @@ class IPSeriesPPC(PPC): _maxBootPartSize = 10 def bootDevice(self): - bootDev = None - - # We want the first PReP partition. - for device in self.anaconda.id.storage.partitions: - if device.format.type == "prepboot": - bootDev = device - break - - return bootDev + # use booty's PReP-picking algorithm + return self.anaconda.id.bootloader.pickPReP() def bootloaderChoices(self, bl): ret = {} -- 1.8.3.1

2 1

[PATCH] Fix lightbox signal handling (#1000927)
by David Shea 11 Sep '13

11 Sep '13

As part of this, I also: - Removed anaconda_lb_destroy, since it didn't do anything useful that a signal handler couldn't - Bumped the soversion of libAnacondaWidgets since this removes a public interface - Switched to using destroy handlers to cleanup the lightbox references that are set in other objects - Renamed some variables and added some comments to hopefully make it easier to tell what's actually going on --- pyanaconda/ui/gui/tools/run-spoke.py | 2 +- pyanaconda/ui/gui/utils.py | 2 +- scripts/makeupdates | 2 +- widgets/src/Makefile.am | 2 +- widgets/src/lightbox.c | 290 ++++++++++++++++++++++++----------- widgets/src/lightbox.h | 1 - 6 files changed, 206 insertions(+), 93 deletions(-) diff --git a/pyanaconda/ui/gui/tools/run-spoke.py b/pyanaconda/ui/gui/tools/run-spoke.py index d3a83a4..d7101cf 100755 --- a/pyanaconda/ui/gui/tools/run-spoke.py +++ b/pyanaconda/ui/gui/tools/run-spoke.py @@ -20,7 +20,7 @@ if len(sys.argv)<2: sys.exit(1) # This is a hack to make sure the AnacondaWidgets library gets loaded -ctypes.CDLL("libAnacondaWidgets.so.0", ctypes.RTLD_GLOBAL) +ctypes.CDLL("libAnacondaWidgets.so.1", ctypes.RTLD_GLOBAL) # Logging always needs to be set up first thing, or there'll be tracebacks. from pyanaconda import anaconda_log diff --git a/pyanaconda/ui/gui/utils.py b/pyanaconda/ui/gui/utils.py index 38e0f4c..06847dc 100644 --- a/pyanaconda/ui/gui/utils.py +++ b/pyanaconda/ui/gui/utils.py @@ -101,7 +101,7 @@ def enlightbox(mainWindow, dialog): ANACONDA_WINDOW_GROUP.add_window(lightbox) dialog.set_transient_for(lightbox) yield - AnacondaWidgets.lb_destroy(lightbox) + lightbox.destroy() def ignoreEscape(dlg): """Prevent a dialog from accepting the escape keybinding, which emits a diff --git a/scripts/makeupdates b/scripts/makeupdates index 6e291fd..273428a 100755 --- a/scripts/makeupdates +++ b/scripts/makeupdates @@ -358,7 +358,7 @@ def copyUpdatedWidgets(updates, cwd): os.system('make') - files = ["libAnacondaWidgets.so", "libAnacondaWidgets.so.0", "libAnacondaWidgets.so.0.0.0"] + files = ["libAnacondaWidgets.so", "libAnacondaWidgets.so.1", "libAnacondaWidgets.so.1.0.0"] for f in files: path = os.path.normpath(cwd + "/widgets/src/.libs/" + f) if os.path.islink(path) and not os.path.exists(updates + libdir + os.path.basename(path)): diff --git a/widgets/src/Makefile.am b/widgets/src/Makefile.am index 4b3bfde..aaab626 100644 --- a/widgets/src/Makefile.am +++ b/widgets/src/Makefile.am @@ -65,7 +65,7 @@ libAnacondaWidgets_la_CFLAGS = $(GTK_CFLAGS) $(GLADEUI_CFLAGS) $(LIBXKLAVIER_CFL -DWIDGETS_DATADIR=$(WIDGETSDATA)\ -DTZMAP_DATADIR=$(TZMAPDATA) libAnacondaWidgets_la_LIBADD = $(GTK_LIBS) $(GLADEUI_LIBS) $(LIBXKLAVIER_LIBS) -libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) +libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) -version-info 1:0:0 libAnacondaWidgets_la_SOURCES = $(SOURCES) $(HDRS) \ glade-adaptor.c diff --git a/widgets/src/lightbox.c b/widgets/src/lightbox.c index 43edeeb..41b01db 100644 --- a/widgets/src/lightbox.c +++ b/widgets/src/lightbox.c @@ -32,48 +32,150 @@ */ #include <cairo.h> -#include <gdk/gdk.h> #include <gtk/gtk.h> +#include <string.h> #include "lightbox.h" -/* GObject ID for the parent window's configure-event signal handler */ +/* GObject IDs for the parent window's signal handlers */ #define ANACONDA_LB_PARENT_CONFIGURE_EVENT "anaconda-configure-event" +#define ANACONDA_LB_PARENT_DESTROY_EVENT "anaconda-destroy-event" -static void anaconda_lb_move_window_to_parent(GtkWidget *parent, - GdkEventConfigure *e, - GtkWindow *window) +/* + * Restack the lightbox and its parent any time we receive a configure-event + * on the lightbox + */ +static gboolean anaconda_lb_configure_event( + GtkWidget *lightbox, + GdkEvent *event, + gpointer parent + ) { - GdkWindow *p_window, *w_window; - int pwidth, pheight, width, height, px, py, x, y, nx, ny; + GdkWindow *g_parent_window; + GdkWindow *g_lightbox_window; + + if ((event->type != GDK_CONFIGURE) || + !GTK_IS_WIDGET(parent) || + !GTK_IS_WINDOW(lightbox)) + { + return FALSE; + } + + g_lightbox_window = gtk_widget_get_window(lightbox); + if (NULL == g_lightbox_window) + { + return FALSE; + } + + g_parent_window = gtk_widget_get_window(GTK_WIDGET(parent)); + if (NULL == g_parent_window) + { + return FALSE; + } + + gdk_window_restack(g_lightbox_window, g_parent_window, TRUE); + return FALSE; +} + +/* + * Adjust the lightbox any time the parent window's size, position or stacking + * changes. Returns FALSE to allow signal processing to continue. + */ +static gboolean anaconda_lb_parent_configure_event( + GtkWidget *parent, + GdkEvent *event, + gpointer lightbox + ) +{ + /* Always return FALSE to continue processing for this signal. */ + GdkWindow *g_parent_window; + GdkWindow *g_lightbox_window; + + if ((event->type != GDK_CONFIGURE) || + !GTK_IS_WIDGET(parent) || + !GTK_IS_WINDOW(lightbox)) + { + return FALSE; + } - if (!GTK_IS_WIDGET(parent) || !GTK_IS_WINDOW(window)) - return; + g_lightbox_window = gtk_widget_get_window(GTK_WIDGET(lightbox)); + if (NULL == g_lightbox_window) + { + /* + * No underlying GdkWindow. This may mean the lightbox is not yet + * realized, but whatever the cause, there's nothing we can do here. + */ + return FALSE; + } - p_window = gtk_widget_get_window (parent); - w_window = gtk_widget_get_window (GTK_WIDGET(window)); + /* Resize and move the window according to the event data */ + gdk_window_move_resize(g_lightbox_window, + event->configure.x, + event->configure.y, + event->configure.width, + event->configure.height + ); - if (!GDK_IS_WINDOW(p_window) || !GDK_IS_WINDOW(w_window)) - return; + g_parent_window = gtk_widget_get_window(parent); + if (NULL == g_parent_window) + { + return FALSE; + } - pwidth = gdk_window_get_width (p_window); - pheight = gdk_window_get_height (p_window); - gdk_window_get_position(p_window, &px, &py); + /* Stack the lightbox above the parent */ + gdk_window_restack(g_lightbox_window, g_parent_window, TRUE); - width = gdk_window_get_width (w_window); - height = gdk_window_get_height (w_window); - gdk_window_get_position(w_window, &x, &y); + return FALSE; +} - nx = px + pwidth / 2 - width / 2; - ny = py + pheight / 2 - height / 2; +/* Clean up references to lightbox held by the parent window */ +static void anaconda_lb_cleanup(GtkWidget *lightbox, gpointer user_data) +{ + guint *p_configure_event_handler; + guint *p_destroy_event_handler; + GtkWindow *parent; - if (x != nx || y != ny) + /* Remove the signal handlers set on the parent window */ + if (GTK_IS_WINDOW(lightbox)) { - gdk_window_move (w_window, nx, ny); - gdk_window_restack(w_window, p_window, TRUE); + parent = gtk_window_get_transient_for(GTK_WINDOW(lightbox)); + if (GTK_IS_WINDOW(parent)) + { + p_configure_event_handler = g_object_get_data(G_OBJECT(lightbox), + ANACONDA_LB_PARENT_CONFIGURE_EVENT); + p_destroy_event_handler = g_object_get_data(G_OBJECT(lightbox), + ANACONDA_LB_PARENT_DESTROY_EVENT); + + if (NULL != p_configure_event_handler) + { + g_signal_handler_disconnect(parent, GPOINTER_TO_UINT(p_configure_event_handler)); + } + + if (NULL != p_destroy_event_handler) + { + g_signal_handler_disconnect(parent, GPOINTER_TO_UINT(p_destroy_event_handler)); + } + } } +} + +static void anaconda_lb_cleanup_parent(GtkWidget *parent, gpointer user_data) +{ + GtkWidget *lightbox; - g_object_set_data(G_OBJECT(window), ANACONDA_LB_PARENT_CONFIGURE_EVENT, NULL); + /* If the parent window is destoryed, destroy the lightbox */ + if (GTK_IS_WIDGET(user_data)) + { + lightbox = GTK_WIDGET(user_data); + + /* + * Clear the destroy id so we don't try disconnecting a signal handler + * while the handler is being called. + */ + g_object_set_data(G_OBJECT(lightbox), ANACONDA_LB_PARENT_DESTROY_EVENT, NULL); + + gtk_widget_destroy(lightbox); + } } /** @@ -89,87 +191,99 @@ static void anaconda_lb_move_window_to_parent(GtkWidget *parent, GtkWindow *anaconda_lb_show_over(GtkWindow *window) { GtkWindow *lightbox; - GdkWindow *w_window; - GdkWindow *l_window; - int width, height; - cairo_t *cr; - cairo_pattern_t *pattern; + GdkWindow *g_window; + + GdkWindow *g_lightbox_window; + GdkWindow *g_parent_window; cairo_surface_t *surface; - guint signal_handler; + cairo_pattern_t *pattern; + cairo_t *cr; + guint configure_event_handler; + guint destroy_event_handler; + + /* Create a new window on top of the parent */ lightbox = (GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL))); gtk_window_set_transient_for(lightbox, window); + + /* Disable the window decorations */ gtk_window_set_decorated(lightbox, FALSE); gtk_window_set_has_resize_grip(lightbox, FALSE); + + /* Set the initial position to the center of the parent */ gtk_window_set_position(lightbox, GTK_WIN_POS_CENTER_ON_PARENT); - gtk_window_set_type_hint (lightbox, GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); + + /* Indicate we will handle drawing the widget so no theme is applied */ gtk_widget_set_app_paintable(GTK_WIDGET(lightbox), TRUE); + gtk_window_set_type_hint(lightbox, GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); - w_window = gtk_widget_get_window (GTK_WIDGET(window)); - width = gdk_window_get_width(w_window); - height = gdk_window_get_height(w_window); - gtk_window_set_default_size(lightbox, width, height); - gtk_widget_realize(GTK_WIDGET(lightbox)); - l_window = gtk_widget_get_window (GTK_WIDGET(lightbox)); - gdk_window_set_background_pattern (l_window, NULL); - gtk_widget_show(GTK_WIDGET(lightbox)); - surface = gdk_window_create_similar_surface(l_window, - CAIRO_CONTENT_COLOR_ALPHA, - width, height); - - cr = cairo_create (surface); - gdk_cairo_set_source_window(cr, w_window, 0, 0); - cairo_paint(cr); - cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.5); - cairo_paint(cr); - cairo_destroy(cr); + /* Set the lightbox to the parent window's dimensions */ + g_window = gtk_widget_get_window(GTK_WIDGET(window)); + gtk_window_set_default_size(lightbox, + gdk_window_get_width(g_window), + gdk_window_get_height(g_window) + ); - pattern = cairo_pattern_create_for_surface (surface); - gdk_window_set_background_pattern(l_window, pattern); - cairo_pattern_destroy (pattern); + /* handle restacking events */ + g_signal_connect(lightbox, "configure-event", + G_CALLBACK(anaconda_lb_configure_event), window); /* make the shade move with the parent window */ - signal_handler = g_signal_connect(window, "configure-event", - G_CALLBACK (anaconda_lb_move_window_to_parent), lightbox); + configure_event_handler = g_signal_connect(window, "configure-event", + G_CALLBACK(anaconda_lb_parent_configure_event), lightbox); + + /* cleanup */ + g_signal_connect(lightbox, "destroy", G_CALLBACK(anaconda_lb_cleanup), NULL); + destroy_event_handler = g_signal_connect(window, "destroy", + G_CALLBACK(anaconda_lb_cleanup_parent), lightbox); - /* Save the signal handler in the lightbox so we can remove it later */ + /* + * Save the signal handlers set on the parent so they can be removed when + * the lightbox is destroyed. + */ g_object_set_data(G_OBJECT(lightbox), ANACONDA_LB_PARENT_CONFIGURE_EVENT, - GUINT_TO_POINTER(signal_handler)); + GUINT_TO_POINTER(configure_event_handler)); - return lightbox; -} + g_object_set_data(G_OBJECT(lightbox), ANACONDA_LB_PARENT_DESTROY_EVENT, + GUINT_TO_POINTER(destroy_event_handler)); -/** - * anaconda_lb_destroy: - * @lightbox: a #GtkWindow - * - * Destroys the previously used lightbox. - * - * Since: 1.0 - */ -void anaconda_lb_destroy(GtkWindow *lightbox) -{ - GtkWindow *window; - gpointer p_signal_handler; + /* + * NB: We should probably be handling the draw signal in order to refresh + * the transparent pattern from the parent window whenver something + * changes, but by the time things get to the signal handler the surface is + * already set up and doesn't support alpha channels and replacing it + * doesn't seem to work quite right. Besides, none of these windows are + * supposed to move anyway. + */ - /* Disconnect the configure-event from the contained window */ - if (GTK_IS_WINDOW(lightbox)) - { - window = gtk_window_get_transient_for(GTK_WINDOW(lightbox)); + /* Realize the window to initialize the Gdk objects */ + gtk_widget_realize(GTK_WIDGET(lightbox)); + g_lightbox_window = gtk_widget_get_window(GTK_WIDGET(lightbox)); + g_parent_window = gtk_widget_get_window(GTK_WIDGET(window)); - p_signal_handler = g_object_get_data(G_OBJECT(lightbox), - ANACONDA_LB_PARENT_CONFIGURE_EVENT); - if ((NULL != p_signal_handler) && GTK_IS_WINDOW(window)) - { - /* XXX HAAAAAAACK: - * If the configure-event signal handler for the contained window - * hasn't fired yet, do it now. - */ - g_signal_emit_by_name(window, "configure-event", window); + /* Create a new surface that supports alpha content */ + surface = gdk_window_create_similar_surface(g_lightbox_window, + CAIRO_CONTENT_COLOR_ALPHA, + gdk_window_get_width(g_parent_window), + gdk_window_get_height(g_parent_window)); + cr = cairo_create(surface); - g_signal_handler_disconnect(window, GPOINTER_TO_UINT(p_signal_handler)); - } - } + /* Use the parent window as a pattern and paint it on the surface */ + gdk_cairo_set_source_window(cr, g_parent_window, 0, 0); + cairo_paint(cr); - gtk_widget_destroy(GTK_WIDGET(lightbox)); + /* Paint a black, 50% transparent shade */ + cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.5); + cairo_paint(cr); + + cairo_destroy(cr); + + /* Use the surface we painted as the window background */ + pattern = cairo_pattern_create_for_surface(surface); + gdk_window_set_background_pattern(g_lightbox_window, pattern); + cairo_pattern_destroy(pattern); + + gtk_widget_show_all(GTK_WIDGET(lightbox)); + + return lightbox; } diff --git a/widgets/src/lightbox.h b/widgets/src/lightbox.h index 3a97010..db83bd5 100644 --- a/widgets/src/lightbox.h +++ b/widgets/src/lightbox.h @@ -23,6 +23,5 @@ #include <gtk/gtk.h> GtkWindow *anaconda_lb_show_over(GtkWindow *window); -void anaconda_lb_destroy(GtkWindow *lightbox); #endif -- 1.8.3.1

2 4

[PATCH] Remove some more unused imports.
by Chris Lumens 11 Sep '13

11 Sep '13

--- pyanaconda/anaconda.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyanaconda/anaconda.py b/pyanaconda/anaconda.py index 5bc83e5..9a5aecc 100644 --- a/pyanaconda/anaconda.py +++ b/pyanaconda/anaconda.py @@ -28,7 +28,7 @@ # Matt Wilson <msw(a)rpath.com> # -import os, time +import os import sys from constants import ROOT_PATH from tempfile import mkstemp @@ -36,7 +36,6 @@ from tempfile import mkstemp from pyanaconda.bootloader import get_bootloader from pyanaconda import constants from pyanaconda import addons -from pyanaconda.i18n import _ import logging log = logging.getLogger("anaconda") -- 1.8.1.2

2 1

[PATCH rhel6-branch] PPC: strengthen PReP-picking algorithm (#877852)
by Will Woods 11 Sep '13

11 Sep '13

pSeries-style systems can have multiple PReP partitions, as long as there's only one per disk. It's kind of like the x86 MBR that way. The current code in booty and platform.py *always* picks the first PReP partition, which will fail if if you have (e.g.) an OS already installed on /dev/sda and you're doing a new install onto /dev/sdb. This patch adds ppcBootloaderInfo.pickPReP(), which tries to find the best PReP partition to use according to the following rules: 1) If we're creating a new PReP partition, use that; 2) Otherwise, if there's a PReP partition already on the disk that contains /boot, use that; 3) Failing that, use the first available PReP partition (as before). This should make mkofboot actually install yaboot into the correct PReP partition. IPSeriesPPC.bootDevice() has been changed to use this same algorithm, so the two of them will agree about what the boot device is. --- booty/ppc.py | 37 ++++++++++++++++++++++++++++++++----- platform.py | 11 ++--------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/booty/ppc.py b/booty/ppc.py index 6f62071..401f505 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -7,6 +7,35 @@ from bootloaderInfo import * import iutil class ppcBootloaderInfo(bootloaderInfo): + def pickPReP(self): + # if we created a new PReP partition, pick that + for a in self.storage.findActions(type="create", obj="format"): + if a.format.type == "prepboot": + return a.device + + # otherwise, look at the existing PReP partitions. + prepdevs = [] + for dev in self.storage.fsset.devices: + if (dev.format.type == "prepboot" and + dev.partedPartition.getFlag(parted.PARTITION_BOOT)): + prepdevs.append(dev) + + # we'd prefer a PReP partition that's on the same disk as /boot. + try: + bootdisk = self.storage.mountpoints["/boot"].disk + except KeyError: + bootdisk = self.storage.rootDevice.disk + for dev in prepdevs: + if dev.disk == bootdisk: + return dev + + # failing that, return the first PReP partition we found + if len(prepdevs) != 0: + return prepdevs[0] + + # Alas, no PReP to be found.. + return None + def getBootDevs(self, bl): import parted @@ -14,10 +43,9 @@ class ppcBootloaderInfo(bootloaderInfo): machine = iutil.getPPCMachine() if machine == 'pSeries': - for dev in self.storage.fsset.devices: - if (dev.format.type == "prepboot" and - dev.partedPartition.getFlag(parted.PARTITION_BOOT)): - retval.append(dev.path) + prep = self.pickPReP() + if prep: + retval.append(prep.path) elif machine == 'PMac': for dev in self.storage.fsset.devices: if dev.format.type == "hfs" and dev.format.bootable: @@ -31,7 +59,6 @@ class ppcBootloaderInfo(bootloaderInfo): except KeyError: # Try / if we don't have this we're not going to work device = self.storage.rootDevice - retval.append(device.path) else: if bl.getDevice(): diff --git a/platform.py b/platform.py index 7bc75ec..e866133 100644 --- a/platform.py +++ b/platform.py @@ -392,15 +392,8 @@ class IPSeriesPPC(PPC): _maxBootPartSize = 10 def bootDevice(self): - bootDev = None - - # We want the first PReP partition. - for device in self.anaconda.id.storage.partitions: - if device.format.type == "prepboot": - bootDev = device - break - - return bootDev + # use booty's PReP-picking algorithm + return self.anaconda.id.bootloader.pickPReP() def bootloaderChoices(self, bl): ret = {} -- 1.8.3.1

1 1

[PATCH rhel6-branch] PPC: strengthen PReP-picking algorithm (#877852)
by Will Woods 11 Sep '13

11 Sep '13

pSeries-style systems can have multiple PReP partitions, as long as there's only one per disk. It's kind of like the x86 MBR that way. The current code in booty and platform.py *always* picks the first PReP partition, which will fail if if you have (e.g.) an OS already installed on /dev/sda and you're doing a new install onto /dev/sdb. This patch adds ppcBootloaderInfo.pickPReP(), which tries to find the best PReP partition to use according to the following rules: 1) If we're creating a new PReP partition, use that; 2) Otherwise, if there's a PReP partition already on the disk that contains /boot, use that; 3) Failing that, use the first available PReP partition (as before). This should make mkofboot actually install yaboot into the correct PReP partition. IPSeriesPPC.bootDevice() has been changed to use this same algorithm, so the two of them will agree about what the boot device is. --- booty/ppc.py | 37 ++++++++++++++++++++++++++++++++----- platform.py | 11 ++--------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/booty/ppc.py b/booty/ppc.py index 6f62071..401f505 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -7,6 +7,35 @@ from bootloaderInfo import * import iutil class ppcBootloaderInfo(bootloaderInfo): + def pickPReP(self): + # if we created a new PReP partition, pick that + for a in self.storage.findActions(type="create", obj="format"): + if a.format.type == "prepboot": + return a.device + + # otherwise, look at the existing PReP partitions. + prepdevs = [] + for dev in self.storage.fsset.devices: + if (dev.format.type == "prepboot" and + dev.partedPartition.getFlag(parted.PARTITION_BOOT)): + prepdevs.append(dev) + + # we'd prefer a PReP partition that's on the same disk as /boot. + try: + bootdisk = self.storage.mountpoints["/boot"].disk + except KeyError: + bootdisk = self.storage.rootDevice.disk + for dev in prepdevs: + if dev.disk == bootdisk: + return dev + + # failing that, return the first PReP partition we found + if len(prepdevs) != 0: + return prepdevs[0] + + # Alas, no PReP to be found.. + return None + def getBootDevs(self, bl): import parted @@ -14,10 +43,9 @@ class ppcBootloaderInfo(bootloaderInfo): machine = iutil.getPPCMachine() if machine == 'pSeries': - for dev in self.storage.fsset.devices: - if (dev.format.type == "prepboot" and - dev.partedPartition.getFlag(parted.PARTITION_BOOT)): - retval.append(dev.path) + prep = self.pickPReP() + if prep: + retval.append(prep.path) elif machine == 'PMac': for dev in self.storage.fsset.devices: if dev.format.type == "hfs" and dev.format.bootable: @@ -31,7 +59,6 @@ class ppcBootloaderInfo(bootloaderInfo): except KeyError: # Try / if we don't have this we're not going to work device = self.storage.rootDevice - retval.append(device.path) else: if bl.getDevice(): diff --git a/platform.py b/platform.py index 7bc75ec..e866133 100644 --- a/platform.py +++ b/platform.py @@ -392,15 +392,8 @@ class IPSeriesPPC(PPC): _maxBootPartSize = 10 def bootDevice(self): - bootDev = None - - # We want the first PReP partition. - for device in self.anaconda.id.storage.partitions: - if device.format.type == "prepboot": - bootDev = device - break - - return bootDev + # use booty's PReP-picking algorithm + return self.anaconda.id.bootloader.pickPReP() def bootloaderChoices(self, bl): ret = {} -- 1.8.3.1

3 3

[PATCH] Remove unused imports in the network spoke.
by Chris Lumens 11 Sep '13

11 Sep '13

--- pyanaconda/ui/gui/spokes/network.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index 43d12e1..7be4229 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -48,9 +48,7 @@ from pyanaconda.nm import nm_device_setting_value, nm_device_ip_config from gi.repository import GLib, GObject, Pango, Gio, NetworkManager, NMClient import dbus import dbus.service -import socket import subprocess -import struct import string from dbus.mainloop.glib import DBusGMainLoop -- 1.8.1.2

2 1

[master][PATCH] Move the Anaconda class to a proper module
by Vratislav Podzimek 10 Sep '13

10 Sep '13

This prevents unittests, ipython sessions, etc. from importing a bunch of modules when anything is imported from the pyanaconda package. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- anaconda | 2 +- pyanaconda/__init__.py | 228 ------------------------------------------------- pyanaconda/anaconda.py | 228 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 229 insertions(+), 229 deletions(-) create mode 100644 pyanaconda/anaconda.py diff --git a/anaconda b/anaconda index fd8e2fe..3e745e3 100755 --- a/anaconda +++ b/anaconda @@ -766,7 +766,7 @@ if __name__ == "__main__": else: print "anaconda %s (pre-release) started." % verdesc - from pyanaconda import Anaconda + from pyanaconda.anaconda import Anaconda anaconda = Anaconda() iutil.setup_translations(gettext) diff --git a/pyanaconda/__init__.py b/pyanaconda/__init__.py index 5bc83e5..e69de29 100644 --- a/pyanaconda/__init__.py +++ b/pyanaconda/__init__.py @@ -1,228 +0,0 @@ -#!/usr/bin/python -# -# anaconda: The Red Hat Linux Installation program -# -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -# Red Hat, Inc. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty 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, see <http://www.gnu.org/licenses/>. -# -# Author(s): Brent Fox <bfox(a)redhat.com> -# Mike Fulbright <msf(a)redhat.com> -# Jakub Jelinek <jakub(a)redhat.com> -# Jeremy Katz <katzj(a)redhat.com> -# Chris Lumens <clumens(a)redhat.com> -# Paul Nasrat <pnasrat(a)redhat.com> -# Erik Troan <ewt(a)rpath.com> -# Matt Wilson <msw(a)rpath.com> -# - -import os, time -import sys -from constants import ROOT_PATH -from tempfile import mkstemp - -from pyanaconda.bootloader import get_bootloader -from pyanaconda import constants -from pyanaconda import addons -from pyanaconda.i18n import _ - -import logging -log = logging.getLogger("anaconda") -stdoutLog = logging.getLogger("anaconda.stdout") - -class Anaconda(object): - def __init__(self): - import desktop - - self._bootloader = None - self.canReIPL = False - self.desktop = desktop.Desktop() - self.dir = None - self.displayMode = None - self.extraModules = [] - self.id = None - self._instClass = None - self._intf = None - self.isHeadless = False - self.ksdata = None - self.mediaDevice = None - self.methodstr = None - self.opts = None - self._payload = None - self.proxy = None - self.proxyUsername = None - self.proxyPassword = None - self.reIPLMessage = None - self.rescue = False - self.rescue_mount = True - self.rootParts = None - - self.stage2 = None - self._storage = None - self.updateSrc = None - self.mehConfig = None - - # *sigh* we still need to be able to write this out - self.xdriver = None - - @property - def bootloader(self): - if not self._bootloader: - self._bootloader = get_bootloader() - - return self._bootloader - - @property - def instClass(self): - if not self._instClass: - from installclass import DefaultInstall - self._instClass = DefaultInstall() - - return self._instClass - - def _getInterface(self): - return self._intf - - def _setInterface(self, v): - # "lambda cannot contain assignment" - self._intf = v - - def _delInterface(self): - del self._intf - - intf = property(_getInterface, _setInterface, _delInterface) - - @property - def payload(self): - # Try to find the packaging payload class. First try the install - # class. If it doesn't give us one, fall back to the default. - if not self._payload: - klass = self.instClass.getBackend() - - if not klass: - from flags import flags - - if flags.livecdInstall: - from pyanaconda.packaging.livepayload import LiveImagePayload - klass = LiveImagePayload - elif self.ksdata.method.method == "liveimg": - from pyanaconda.packaging.livepayload import LiveImageKSPayload - klass = LiveImageKSPayload - elif flags.dnf: - from pyanaconda.packaging.dnfpayload import DNFPayload as klass - else: - from pyanaconda.packaging.yumpayload import YumPayload - klass = YumPayload - - self._payload = klass(self.ksdata) - - return self._payload - - @property - def protected(self): - import stat - specs = [] - if os.path.exists("/run/initramfs/livedev") and \ - stat.S_ISBLK(os.stat("/run/initramfs/livedev")[stat.ST_MODE]): - specs.append(os.readlink("/run/initramfs/livedev")) - - if self.methodstr and self.methodstr.startswith("hd:"): - specs.append(self.methodstr[3:].split(":", 3)[0]) - - if self.stage2 and self.stage2.startswith("hd:"): - specs.append(self.stage2[3:].split(":", 3)[0]) - - return specs - - @property - def storage(self): - if not self._storage: - import blivet - self._storage = blivet.Blivet(ksdata=self.ksdata) - - if self.instClass.defaultFS: - self._storage.setDefaultFSType(self.instClass.defaultFS) - - return self._storage - - def dumpState(self): - from meh import ExceptionInfo - from meh.dump import ReverseExceptionDump - from inspect import stack as _stack - from traceback import format_stack - - # Skip the frames for dumpState and the signal handler. - stack = _stack()[2:] - stack.reverse() - exn = ReverseExceptionDump(ExceptionInfo(None, None, stack), - self.mehConfig) - - # gather up info on the running threads - threads = "\nThreads\n-------\n" - for thread_id, frame in sys._current_frames().iteritems(): - threads += "\nThread %s\n" % (thread_id,) - threads += "".join(format_stack(frame)) - - # dump to a unique file - (fd, filename) = mkstemp(prefix="anaconda-tb-", dir="/tmp") - dump_text = exn.traceback_and_object_dump(self) - dump_text += threads - dump_text = dump_text.encode("utf-8") - os.write(fd, dump_text) - os.close(fd) - - # append to a given file - with open("/tmp/anaconda-tb-all.log", "a+") as f: - f.write("--- traceback: %s ---\n" % filename) - f.write(dump_text + "\n") - - def initInterface(self, addon_paths=None): - if self._intf: - raise RuntimeError("Second attempt to initialize the InstallInterface") - - if self.displayMode == 'g': - from pyanaconda.ui.gui import GraphicalUserInterface - self._intf = GraphicalUserInterface(self.storage, self.payload, - self.instClass) - - # needs to be refreshed now we know if gui or tui will take place - addon_paths = addons.collect_addon_paths(constants.ADDON_PATHS, - ui_subdir="gui") - elif self.displayMode in ['t', 'c']: # text and command line are the same - from pyanaconda.ui.tui import TextUserInterface - self._intf = TextUserInterface(self.storage, self.payload, - self.instClass) - - # needs to be refreshed now we know if gui or tui will take place - addon_paths = addons.collect_addon_paths(constants.ADDON_PATHS, - ui_subdir="tui") - else: - raise RuntimeError("Unsupported displayMode: %s" % self.displayMode) - - if addon_paths: - self._intf.update_paths(addon_paths) - - def writeXdriver(self, root = None): - # this should go away at some point, but until it does, we - # need to keep it around. - if self.xdriver is None: - return - if root is None: - root = ROOT_PATH - if not os.path.isdir("%s/etc/X11" %(root,)): - os.makedirs("%s/etc/X11" %(root,), mode=0755) - f = open("%s/etc/X11/xorg.conf" %(root,), 'w') - f.write('Section "Device"\n\tIdentifier "Videocard0"\n\tDriver "%s"\nEndSection\n' % self.xdriver) - f.close() diff --git a/pyanaconda/anaconda.py b/pyanaconda/anaconda.py new file mode 100644 index 0000000..5bc83e5 --- /dev/null +++ b/pyanaconda/anaconda.py @@ -0,0 +1,228 @@ +#!/usr/bin/python +# +# anaconda: The Red Hat Linux Installation program +# +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +# Red Hat, Inc. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty 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, see <http://www.gnu.org/licenses/>. +# +# Author(s): Brent Fox <bfox(a)redhat.com> +# Mike Fulbright <msf(a)redhat.com> +# Jakub Jelinek <jakub(a)redhat.com> +# Jeremy Katz <katzj(a)redhat.com> +# Chris Lumens <clumens(a)redhat.com> +# Paul Nasrat <pnasrat(a)redhat.com> +# Erik Troan <ewt(a)rpath.com> +# Matt Wilson <msw(a)rpath.com> +# + +import os, time +import sys +from constants import ROOT_PATH +from tempfile import mkstemp + +from pyanaconda.bootloader import get_bootloader +from pyanaconda import constants +from pyanaconda import addons +from pyanaconda.i18n import _ + +import logging +log = logging.getLogger("anaconda") +stdoutLog = logging.getLogger("anaconda.stdout") + +class Anaconda(object): + def __init__(self): + import desktop + + self._bootloader = None + self.canReIPL = False + self.desktop = desktop.Desktop() + self.dir = None + self.displayMode = None + self.extraModules = [] + self.id = None + self._instClass = None + self._intf = None + self.isHeadless = False + self.ksdata = None + self.mediaDevice = None + self.methodstr = None + self.opts = None + self._payload = None + self.proxy = None + self.proxyUsername = None + self.proxyPassword = None + self.reIPLMessage = None + self.rescue = False + self.rescue_mount = True + self.rootParts = None + + self.stage2 = None + self._storage = None + self.updateSrc = None + self.mehConfig = None + + # *sigh* we still need to be able to write this out + self.xdriver = None + + @property + def bootloader(self): + if not self._bootloader: + self._bootloader = get_bootloader() + + return self._bootloader + + @property + def instClass(self): + if not self._instClass: + from installclass import DefaultInstall + self._instClass = DefaultInstall() + + return self._instClass + + def _getInterface(self): + return self._intf + + def _setInterface(self, v): + # "lambda cannot contain assignment" + self._intf = v + + def _delInterface(self): + del self._intf + + intf = property(_getInterface, _setInterface, _delInterface) + + @property + def payload(self): + # Try to find the packaging payload class. First try the install + # class. If it doesn't give us one, fall back to the default. + if not self._payload: + klass = self.instClass.getBackend() + + if not klass: + from flags import flags + + if flags.livecdInstall: + from pyanaconda.packaging.livepayload import LiveImagePayload + klass = LiveImagePayload + elif self.ksdata.method.method == "liveimg": + from pyanaconda.packaging.livepayload import LiveImageKSPayload + klass = LiveImageKSPayload + elif flags.dnf: + from pyanaconda.packaging.dnfpayload import DNFPayload as klass + else: + from pyanaconda.packaging.yumpayload import YumPayload + klass = YumPayload + + self._payload = klass(self.ksdata) + + return self._payload + + @property + def protected(self): + import stat + specs = [] + if os.path.exists("/run/initramfs/livedev") and \ + stat.S_ISBLK(os.stat("/run/initramfs/livedev")[stat.ST_MODE]): + specs.append(os.readlink("/run/initramfs/livedev")) + + if self.methodstr and self.methodstr.startswith("hd:"): + specs.append(self.methodstr[3:].split(":", 3)[0]) + + if self.stage2 and self.stage2.startswith("hd:"): + specs.append(self.stage2[3:].split(":", 3)[0]) + + return specs + + @property + def storage(self): + if not self._storage: + import blivet + self._storage = blivet.Blivet(ksdata=self.ksdata) + + if self.instClass.defaultFS: + self._storage.setDefaultFSType(self.instClass.defaultFS) + + return self._storage + + def dumpState(self): + from meh import ExceptionInfo + from meh.dump import ReverseExceptionDump + from inspect import stack as _stack + from traceback import format_stack + + # Skip the frames for dumpState and the signal handler. + stack = _stack()[2:] + stack.reverse() + exn = ReverseExceptionDump(ExceptionInfo(None, None, stack), + self.mehConfig) + + # gather up info on the running threads + threads = "\nThreads\n-------\n" + for thread_id, frame in sys._current_frames().iteritems(): + threads += "\nThread %s\n" % (thread_id,) + threads += "".join(format_stack(frame)) + + # dump to a unique file + (fd, filename) = mkstemp(prefix="anaconda-tb-", dir="/tmp") + dump_text = exn.traceback_and_object_dump(self) + dump_text += threads + dump_text = dump_text.encode("utf-8") + os.write(fd, dump_text) + os.close(fd) + + # append to a given file + with open("/tmp/anaconda-tb-all.log", "a+") as f: + f.write("--- traceback: %s ---\n" % filename) + f.write(dump_text + "\n") + + def initInterface(self, addon_paths=None): + if self._intf: + raise RuntimeError("Second attempt to initialize the InstallInterface") + + if self.displayMode == 'g': + from pyanaconda.ui.gui import GraphicalUserInterface + self._intf = GraphicalUserInterface(self.storage, self.payload, + self.instClass) + + # needs to be refreshed now we know if gui or tui will take place + addon_paths = addons.collect_addon_paths(constants.ADDON_PATHS, + ui_subdir="gui") + elif self.displayMode in ['t', 'c']: # text and command line are the same + from pyanaconda.ui.tui import TextUserInterface + self._intf = TextUserInterface(self.storage, self.payload, + self.instClass) + + # needs to be refreshed now we know if gui or tui will take place + addon_paths = addons.collect_addon_paths(constants.ADDON_PATHS, + ui_subdir="tui") + else: + raise RuntimeError("Unsupported displayMode: %s" % self.displayMode) + + if addon_paths: + self._intf.update_paths(addon_paths) + + def writeXdriver(self, root = None): + # this should go away at some point, but until it does, we + # need to keep it around. + if self.xdriver is None: + return + if root is None: + root = ROOT_PATH + if not os.path.isdir("%s/etc/X11" %(root,)): + os.makedirs("%s/etc/X11" %(root,), mode=0755) + f = open("%s/etc/X11/xorg.conf" %(root,), 'w') + f.write('Section "Device"\n\tIdentifier "Videocard0"\n\tDriver "%s"\nEndSection\n' % self.xdriver) + f.close() -- 1.7.11.7

2 1

[master/rhel7-branch][PATCH] Firstboot should be disabled by default after automated installations
by Vratislav Podzimek 10 Sep '13

10 Sep '13

Resolves: rhbz#985277 Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/install.py | 1 + pyanaconda/kickstart.py | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/pyanaconda/install.py b/pyanaconda/install.py index 4b23016..0742d6f 100644 --- a/pyanaconda/install.py +++ b/pyanaconda/install.py @@ -131,6 +131,7 @@ def doInstall(storage, payload, ksdata, instClass): threadMgr.wait_all() with progress_report(_("Setting up the installation environment")): + ksdata.firstboot.setup(storage, ksdata, instClass) ksdata.addons.setup(storage, ksdata, instClass) storage.updateKSData() # this puts custom storage info into ksdata diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index d6baaaa..3963889 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -531,6 +531,11 @@ class Firewall(commands.firewall.F14_Firewall): iutil.execWithRedirect(cmd, args, root=ROOT_PATH) class Firstboot(commands.firstboot.FC3_Firstboot): + def setup(self, *args): + # firstboot should be disabled by default after kickstart installations + if flags.automatedInstall and not self.seen: + self.firstboot = FIRSTBOOT_SKIP + def execute(self, *args): action = "enable" -- 1.7.11.7

2 1

[master][PATCH] Fix typo introduced in refactorization (#1005511)
by Vratislav Podzimek 10 Sep '13

10 Sep '13

Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- 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 dafd7c0..393e52a 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -549,7 +549,7 @@ class ContainerDialog(GUIObject): self.encrypted = self._encryptCheckbutton.get_active() self.size_policy = size - self.builder._error_label.set_text("") + self._error_label.set_text("") self.window.destroy() def run(self): -- 1.7.11.7

2 1

[initial-setup] Set up translations properly
by Vratislav Podzimek 10 Sep '13

10 Sep '13

Patches that make translations in the build process and runtime of the Initial Setup work properly. Vratislav Podzimek (2): Make handling translations easier Make translations work .tx/config | 8 +-- MANIFEST.in | 3 +- Makefile | 20 +++++++- initial-setup.spec | 4 +- initial_setup/gui/gui.py | 5 +- initial_setup/tui/hubs/initial_setup_hub.py | 5 +- initial_setup/tui/tui.py | 5 +- locale/cs_CZ/LC_MESSAGES/initial-setup.po | 27 ---------- locale/initial-setup.pot | 26 ---------- po/Makefile | 77 +++++++++++++++++++++++++++++ po/initial-setup.pot | 41 +++++++++++++++ setup.py | 11 ----- 12 files changed, 153 insertions(+), 79 deletions(-) delete mode 100644 locale/cs_CZ/LC_MESSAGES/initial-setup.po delete mode 100644 locale/initial-setup.pot create mode 100644 po/Makefile create mode 100644 po/initial-setup.pot -- 1.8.3.1

2 3

[master][PATCH] Remove magic from the passphrase dialog
by Vratislav Podzimek 10 Sep '13

10 Sep '13

Playing with sensitivity and jumping between widgets based on equality of the password and confirmation entries is confusing and may cause problems. The confirmation entry cannot be clicked when the password entry is being eddited, only TAB works for switching into it. And jumping to the save button when the confirmation entry equals the password entry may lead in an incomplete password entered and "confirmed". Hitting ENTER in one of the entries may click the Save button if both entries have the same string. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/lib/passphrase.glade | 2 ++ pyanaconda/ui/gui/spokes/lib/passphrase.py | 29 +++++++++------------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.glade b/pyanaconda/ui/gui/spokes/lib/passphrase.glade index ccff718..731019a 100644 --- a/pyanaconda/ui/gui/spokes/lib/passphrase.glade +++ b/pyanaconda/ui/gui/spokes/lib/passphrase.glade @@ -117,6 +117,7 @@ <property name="width_chars">32</property> <signal name="changed" handler="on_passphrase_changed" swapped="no"/> <signal name="focus-out-event" handler="on_passphrase_editing_done" swapped="no"/> + <signal name="activate" handler="on_entry_activated" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -149,6 +150,7 @@ <property name="invisible_char">●</property> <property name="width_chars">32</property> <signal name="changed" handler="on_confirm_changed" swapped="no"/> + <signal name="activate" handler="on_entry_activated" swapped="no"/> <signal name="focus-out-event" handler="on_confirm_editing_done" swapped="no"/> </object> <packing> diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.py b/pyanaconda/ui/gui/spokes/lib/passphrase.py index 83379ef..bc7251b 100644 --- a/pyanaconda/ui/gui/spokes/lib/passphrase.py +++ b/pyanaconda/ui/gui/spokes/lib/passphrase.py @@ -84,7 +84,6 @@ class PassphraseDialog(GUIObject): if not self.passphrase: self._save_button.set_sensitive(False) - self._confirm_entry.set_sensitive(False) self._passphrase_entry.set_text(self.passphrase) self._confirm_entry.set_text(self.passphrase) @@ -129,37 +128,28 @@ class PassphraseDialog(GUIObject): def on_passphrase_changed(self, entry): self._update_passphrase_strength() - if self._confirm_entry.get_text(): - self._confirm_entry.set_text("") + if not self._save_button.get_sensitive() and \ + entry.get_text() == self._confirm_entry.get_text(): self._set_entry_icon(self._confirm_entry, "", "") + self._save_button.set_sensitive(True) + else: + self._save_button.set_sensitive(False) if not self._pwq_error: self._set_entry_icon(entry, "", "") - self._save_button.set_sensitive(False) - self._confirm_entry.set_sensitive(False) - def on_passphrase_editing_done(self, entry, *args): - sensitive = True if self._pwq_error: icon = "gtk-dialog-error" msg = _(ERROR_WEAK) % self._pwq_error sensitive = False self._set_entry_icon(entry, icon, msg) - self._confirm_entry.set_sensitive(sensitive) - if sensitive: - self._confirm_entry.grab_focus() - - return True - def on_confirm_changed(self, entry): if not self._save_button.get_sensitive() and \ entry.get_text() == self._passphrase_entry.get_text(): - self._save_button.set_sensitive(True) - self._save_button.grab_focus() - self._save_button.grab_default() self._set_entry_icon(entry, "", "") + self._save_button.set_sensitive(True) def on_confirm_editing_done(self, entry, *args): passphrase = self._passphrase_entry.get_text() @@ -169,10 +159,11 @@ class PassphraseDialog(GUIObject): msg = ERROR_NOT_MATCHING self._set_entry_icon(entry, icon, _(msg)) self._save_button.set_sensitive(False) - else: - self._save_button.grab_focus() - self._save_button.grab_default() def on_save_clicked(self, button): self.passphrase = self._passphrase_entry.get_text() + def on_entry_activated(self, entry): + if self._save_button.get_sensitive() and \ + entry.get_text() == self._passphrase_entry.get_text(): + self._save_button.emit("clicked") -- 1.7.11.7

3 4

[master][PATCH] Don't pass extra arguments to LangLocaleHandler.__init__()
by Vratislav Podzimek 10 Sep '13

10 Sep '13

It doesn't expect nor need them. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/langsupport.py | 2 +- pyanaconda/ui/gui/spokes/welcome.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/langsupport.py b/pyanaconda/ui/gui/spokes/langsupport.py index dc6b815..776791e 100644 --- a/pyanaconda/ui/gui/spokes/langsupport.py +++ b/pyanaconda/ui/gui/spokes/langsupport.py @@ -47,7 +47,7 @@ class LangsupportSpoke(LangLocaleHandler, NormalSpoke): def __init__(self, *args, **kwargs): NormalSpoke.__init__(self, *args, **kwargs) - LangLocaleHandler.__init__(self, *args, **kwargs) + LangLocaleHandler.__init__(self) self._selected_locales = set() def initialize(self): diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py index 85352d6..79efdd2 100644 --- a/pyanaconda/ui/gui/spokes/welcome.py +++ b/pyanaconda/ui/gui/spokes/welcome.py @@ -54,7 +54,7 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke): def __init__(self, *args, **kwargs): StandaloneSpoke.__init__(self, *args, **kwargs) - LangLocaleHandler.__init__(self, *args, **kwargs) + LangLocaleHandler.__init__(self) self._xklwrapper = keyboard.XklWrapper.get_instance() self._origStrings = {} -- 1.7.11.7

2 1

[pykickstart] Reset method seen attrs when switching method (#1004889)
by Brian C. Lane 10 Sep '13

10 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> The method initially gets set to cdrom, it can then be switched to another method via UI or when falling back to closest mirror if a repo isn't found. This would result in .seen to be set on multiple methods, and since .cdrom.seen was checked first it would be used for the attributes -- some of which don't exist. This clears the .seen attr when switching methods or setting it to None. It also fixes a problem where None was being returned for too many attrs which caused problems with the internal operations of copy.copy used by the software spoke to detect changes from the previous method settings. Only return None if the name is "method" otherwise pass it through to the superclass' __getattr__ --- pykickstart/commands/method.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pykickstart/commands/method.py b/pykickstart/commands/method.py index 1e0cf90..0dbcb52 100644 --- a/pykickstart/commands/method.py +++ b/pykickstart/commands/method.py @@ -28,6 +28,13 @@ class FC3_Method(KickstartCommand): internals = ["method", "writePriority", "currentCmd", "currentLine", "handler", "lineno", "seen"] + _methods = ["cdrom", "harddrive", "nfs", "url"] + + def _clear_seen(self): + """ Reset all the method's seen attrs to False""" + for method in self._methods: + setattr(getattr(self.handler, method), "seen", False) + def __getattr__(self, name): if self.handler.cdrom.seen: if name == "method": @@ -49,11 +56,15 @@ class FC3_Method(KickstartCommand): return "url" else: return getattr(self.handler.url, name) - else: + elif name == "method": return None + else: + return KickstartCommand.__getattr__(self, name) def __setattr__(self, name, value): if name in self.internals: + if name == "method": + self._clear_seen() if name == "method" and value == "cdrom": setattr(self.handler.cdrom, "seen", True) elif name == "method" and value == "harddrive": @@ -88,6 +99,8 @@ class F19_Method(FC3_Method): removedKeywords = FC3_Method.removedKeywords removedAttrs = FC3_Method.removedAttrs + _methods = FC3_Method._methods + ["liveimg"] + def __getattr__(self, name): if self.handler.liveimg.seen: if name == "method": @@ -99,6 +112,8 @@ class F19_Method(FC3_Method): def __setattr__(self, name, value): if name in self.internals: + if name == "method": + self._clear_seen() if name == "method" and value == "liveimg": setattr(self.handler.liveimg, "seen", True) else: -- 1.8.3.1

2 1

[PATCH] Get rid of the now-unused new_firmware variable.
by Chris Lumens 10 Sep '13

10 Sep '13

--- pyanaconda/packaging/__init__.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 155d8dd..48d4cbd 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -540,8 +540,6 @@ class Payload(object): def _copyDriverDiskFiles(self): import glob - new_firmware = False - # Multiple driver disks may be loaded, so we need to glob for all # the firmware files in the common DD firmware directory for f in glob.glob(DD_FIRMWARE+"/*"): @@ -549,8 +547,6 @@ class Payload(object): shutil.copyfile(f, "%s/lib/firmware/" % ROOT_PATH) except IOError as e: log.error("Could not copy firmware file %s: %s", f, e.strerror) - else: - new_firmware = True #copy RPMS for d in glob.glob(DD_RPMS): -- 1.8.1.2

2 1

[PATCH] Fix handling of flexible specs in onpart for member devices. (#1004885)
by David Lehman 10 Sep '13

10 Sep '13

Short version: don't assume onPart identifier is a name/path. Longer version: If an existing pv was specified using --onpart=UUID=<uuid> the immediate onpart resolution worked, but the volgroup would then fail to resolve the pv.xxx to a device because it assumed the onpart data was a name. --- pyanaconda/kickstart.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index e3f8895..d6baaaa 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -314,7 +314,7 @@ class BTRFSData(commands.btrfs.F17_BTRFSData): # if using --onpart, use original device member_name = ksdata.onPart.get(member, member) if member_name: - dev = devicetree.getDeviceByName(member_name) or lookupAlias(devicetree, member) + dev = devicetree.getDeviceByName(udev.udev_resolve_devspec(member_name)) or lookupAlias(devicetree, member) if not dev: dev = devicetree.resolveDevice(member) @@ -1131,7 +1131,7 @@ class RaidData(commands.raid.F18_RaidData): for member in self.members: # if member is using --onpart, use original device mem = ksdata.onPart.get(member, member) - dev = devicetree.getDeviceByName(mem) or lookupAlias(devicetree, mem) + dev = devicetree.getDeviceByName(udev.udev_resolve_devspec(mem)) or lookupAlias(devicetree, mem) if dev and dev.format.type == "luks": try: dev = devicetree.getChildren(dev)[0] @@ -1350,7 +1350,7 @@ class VolGroupData(commands.volgroup.FC16_VolGroupData): for pv in self.physvols: # if pv is using --onpart, use original device pv = ksdata.onPart.get(pv, pv) - dev = devicetree.getDeviceByName(pv) or lookupAlias(devicetree, pv) + dev = devicetree.getDeviceByName(udev.udev_resolve_devspec(pv)) or lookupAlias(devicetree, pv) if dev and dev.format.type == "luks": try: dev = devicetree.getChildren(dev)[0] -- 1.8.1.4

2 1

[rhel6-branch] Drop support for ssh protocol version 1 (#1004752)
by Brian C. Lane 10 Sep '13

10 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> In fips mode creation of the protocol 1 key causes it to hang. This removes version 1 support during installation. It has no effect on the installed system. --- anaconda | 1 - scripts/mk-images | 5 ----- 2 files changed, 6 deletions(-) diff --git a/anaconda b/anaconda index 0e566f3..09d11c2 100755 --- a/anaconda +++ b/anaconda @@ -459,7 +459,6 @@ def startSsh(): if not fork_orphan(): os.open("/var/log/lastlog", os.O_RDWR | os.O_CREAT, 0644) ssh_keys = { - 'rsa1':'ssh_host_key', 'rsa':'ssh_host_rsa_key', 'dsa':'ssh_host_dsa_key', } diff --git a/scripts/mk-images b/scripts/mk-images index eb2b26a..2439002 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -475,10 +475,6 @@ EOF # key generation takes ages on s390, you really don't want this # for every installation attempt. These are NOT the keys of the # installed system! - echo -n "Generating SSH1 RSA host key: " - /usr/bin/ssh-keygen -q -t rsa1 -f $MBD_DIR/etc/ssh/ssh_host_key \ - -C '' -N '' >&/dev/null - echo echo -n "Generating SSH2 RSA host key: " /usr/bin/ssh-keygen -q -t rsa -f $MBD_DIR/etc/ssh/ssh_host_rsa_key \ -C '' -N '' >&/dev/null @@ -494,7 +490,6 @@ EOF cat > $MBD_DIR/etc/ssh/sshd_config.anaconda <<EOF Port 22 -HostKey /etc/ssh/ssh_host_key HostKey /etc/ssh/ssh_host_rsa_key HostKey /etc/ssh/ssh_host_dsa_key PermitRootLogin yes -- 1.8.3.1

2 1

[master/rhel7] Add more details to iso device selector (#971290)
by Brian C. Lane 10 Sep '13

10 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> Add the device path, format and label or uuid to the dropdown. uuid is only shown if there is no label. -- See and example here: http://bcl.fedorapeople.org/images/isofile.png --- pyanaconda/ui/gui/spokes/source.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index 8dd8ba2..e8fb3c5 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -625,7 +625,14 @@ class SourceSpoke(NormalSpoke): active = 0 idx = 0 for dev in potentialHdisoSources(self.storage.devicetree): - store.append([dev, "%s (%s MB)" % (self._sanitize_model(dev.disk.model), int(dev.size))]) + # path model size format type uuid of format + dev_info = { "model" : self._sanitize_model(dev.disk.model), + "path" : dev.path, + "size" : dev.size, + "format": dev.format.name or "", + "label" : dev.format.label or dev.format.uuid or "" + } + store.append([dev, "%(model)s %(path)s (%(size)s MB) %(format)s %(label)s" % dev_info]) if self.data.method.method == "harddrive" and dev.name == self.data.method.partition: active = idx added = True -- 1.8.3.1

3 3

[master] Test case fixes
by David Shea 10 Sep '13

10 Sep '13

Some tests were failing, some tests were being skipped, and some tests didn't run with the right paths because automake was setting more environment variables than I thought it would. These patches fix all of that. Hey clumens welcome back we got you a present: ============================================================================ Testsuite summary for anaconda 20.12 ============================================================================ # TOTAL: 3 # PASS: 3 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ============================================================================

3 9

[PATCH] Fix check for device state when reading its IPXConfig (#1001776)
by Radek Vykydal 09 Sep '13

09 Sep '13

Device has to be in ACTIVATED state for IPXConfig to be valid. 1) use a recently added nm module function to get IP configuration, replacing python-dbus with GDBus here. Python-dbus would give us stale value. 2) Don't use get_cached_property of GDBus as it would give us stale value too. Instead use DBus.Properties interface call to get current values. --- pyanaconda/nm.py | 77 ++++++++++++++++++++----------------- pyanaconda/ui/gui/spokes/network.py | 64 +++++++++++------------------- 2 files changed, 63 insertions(+), 78 deletions(-) diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py index 1109d6e..4f0923d 100644 --- a/pyanaconda/nm.py +++ b/pyanaconda/nm.py @@ -73,10 +73,27 @@ def _get_proxy(bus_type=Gio.BusType.SYSTEM, cancellable) return proxy +def _get_property(object_path, prop, interface_name_suffix=""): + interface_name = "org.freedesktop.NetworkManager" + interface_name_suffix + proxy = _get_proxy(object_path=object_path, interface_name="org.freedesktop.DBus.Properties") + args = GLib.Variant('(ss)', (interface_name, prop)) + try: + prop = proxy.call_sync("Get", + args, + Gio.DBusCallFlags.NONE, + DEFAULT_DBUS_TIMEOUT, + None) + except GLib.GError as e: + if "org.freedesktop.DBus.Error.AccessDenied" in e.message: + return None + else: + raise + + return prop.unpack()[0] + def nm_state(): """Return state of NetworkManager""" - proxy = _get_proxy() - return proxy.get_cached_property("State").unpack() + return _get_property("/org/freedesktop/NetworkManager", "State") # FIXME - use just GLOBAL? There is some connectivity checking # for GLOBAL in NM (nm_connectivity_get_connected), not sure if @@ -107,11 +124,11 @@ def nm_devices(): devices = devices.unpack()[0] for device in devices: - proxy = _get_proxy(object_path=device, interface_name="org.freedesktop.NetworkManager.Device") - device_type = proxy.get_cached_property("DeviceType").unpack() + device_type = _get_property(device, "DeviceType", ".Device") if device_type not in supported_device_types: continue - interfaces.append(proxy.get_cached_property("Interface").unpack()) + iface = _get_property(device, "Interface", ".Device") + interfaces.append(iface) return interfaces @@ -120,19 +137,15 @@ def nm_activated_devices(): interfaces = [] - proxy = _get_proxy() - active_connections = proxy.get_cached_property("ActiveConnections").unpack() + active_connections = _get_property("/org/freedesktop/NetworkManager", "ActiveConnections") for ac in active_connections: - proxy = _get_proxy(object_path=ac, interface_name="org.freedesktop.NetworkManager.Connection.Active") - state = proxy.get_cached_property("State") - if not state or state.unpack() != NetworkManager.ActiveConnectionState.ACTIVATED: - continue - devices = proxy.get_cached_property("Devices") - if not devices: + state = _get_property(ac, "State", ".Connection.Active") + if state != NetworkManager.ActiveConnectionState.ACTIVATED: continue - for device in devices.unpack(): - proxy = _get_proxy(object_path=device, interface_name="org.freedesktop.NetworkManager.Device") - interfaces.append(proxy.get_cached_property("Interface").unpack()) + devices = _get_property(ac, "Devices", ".Connection.Active") + for device in devices: + iface = _get_property(device, "Interface", ".Device") + interfaces.append(iface) return interfaces @@ -181,18 +194,14 @@ def nm_device_property(name, prop): raise device = device.unpack()[0] - proxy = _get_proxy(object_path=device, interface_name="org.freedesktop.NetworkManager.Device") - if prop in proxy.get_cached_property_names(): - retval = proxy.get_cached_property(prop).unpack() - else: + retval = _get_property(device, prop, ".Device") + if not retval: # Look in device type based interface interface = _device_type_specific_interface(device) if interface: - proxy = _get_proxy(object_path=device, interface_name=interface) - if prop in proxy.get_cached_property_names(): - retval = proxy.get_cached_property(prop).unpack() - else: + retval = _get_property(device, prop, interface[30:]) + if not retval: raise PropertyNotFoundError(prop) else: raise PropertyNotFoundError(prop) @@ -284,10 +293,10 @@ def nm_device_ip_config(name, version=4): return [] if version == 4: - dbus_iface = "org.freedesktop.NetworkManager.IP4Config" + dbus_iface = ".IP4Config" prop= "Ip4Config" elif version == 6: - dbus_iface = "org.freedesktop.NetworkManager.IP6Config" + dbus_iface = ".IP6Config" prop= "Ip6Config" else: return [] @@ -296,9 +305,7 @@ def nm_device_ip_config(name, version=4): if config == "/": return [] - proxy = _get_proxy(object_path=config, interface_name=dbus_iface) - - addresses = proxy.get_cached_property("Addresses").unpack() + addresses = _get_property(config, "Addresses", dbus_iface) addr_list = [] for addr, prefix, gateway in addresses: # TODO - look for a library function (could have used IPy but byte order!) @@ -310,7 +317,7 @@ def nm_device_ip_config(name, version=4): gateway_str = nm_dbus_ay_to_ipv6(gateway) addr_list.append([addr_str, prefix, gateway_str]) - nameservers = proxy.get_cached_property("Nameservers").unpack() + nameservers = _get_property(config, "Nameservers", dbus_iface) ns_list = [] for ns in nameservers: # TODO - look for a library function @@ -322,7 +329,6 @@ def nm_device_ip_config(name, version=4): return [addr_list, ns_list] - def nm_ntp_servers_from_dhcp(): """Return a list of NTP servers that were specified the reply of the DHCP server or empty list if no NTP servers were returned. @@ -335,16 +341,15 @@ def nm_ntp_servers_from_dhcp(): for device in active_devices: # harvest NTP server addresses from DHCPv4 dhcp4_path = nm_device_property(device, "Dhcp4Config") - dhcp4_proxy = _get_proxy(object_path=dhcp4_path, - interface_name="org.freedesktop.NetworkManager.DHCP4Config") - options = dhcp4_proxy.get_cached_property("Options") - if options and 'ntp_servers' in options.unpack(): + options = _get_property(dhcp4_path, "Options", ".DHCP4Config") + if options and 'ntp_servers' in options: # NTP server addresses returned by DHCP are whitespace delimited - ntp_servers_string = options.unpack()["ntp_servers"] + ntp_servers_string = options["ntp_servers"] for ip in ntp_servers_string.split(" "): ntp_servers.append(ip) # NetworkManager does not request NTP/SNTP options for DHCP6 + print ntp_servers return ntp_servers def _device_settings(name): diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index f7c1275..132c7f2 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -43,7 +43,7 @@ from pyanaconda.ui.gui.utils import gtk_call_once, enlightbox from pyanaconda.ui.common import FirstbootSpokeMixIn from pyanaconda import network -from pyanaconda.nm import nm_activated_devices, nm_device_setting_value, nm_dbus_ay_to_ipv6 +from pyanaconda.nm import nm_device_setting_value, nm_device_ip_config from gi.repository import GLib, GObject, Pango, Gio, NetworkManager, NMClient import dbus @@ -704,12 +704,9 @@ class NetworkControlBox(object): self._refresh_parent_vlanid(device) self._refresh_speed_hwaddr(device, state) self._refresh_ap(device, state) - self._refresh_device_cfg(device, state) + self._refresh_device_cfg(device) - def _refresh_device_cfg(self, device, state): - - if state is None: - state = device.get_state() + def _refresh_device_cfg(self, device): dev_type = device.get_device_type() if dev_type == NetworkManager.DeviceType.ETHERNET: @@ -721,45 +718,28 @@ class NetworkControlBox(object): elif dev_type == NetworkManager.DeviceType.VLAN: dt = "wired" - if state == NetworkManager.DeviceState.ACTIVATED: - ipv4cfg = device.get_ip4_config() - ipv6cfg = device.get_ip6_config() - else: - ipv4cfg = None - ipv6cfg = None - - if ipv4cfg: - addr = socket.inet_ntoa(struct.pack('=L', - ipv4cfg.get_addresses()[0].get_address())) - self._set_device_info_value(dt, "ipv4", addr) - dnss = " ".join(socket.inet_ntoa(struct.pack('=L', addr)) - for addr in ipv4cfg.get_nameservers()) - self._set_device_info_value(dt, "dns", dnss) - gateway = socket.inet_ntoa(struct.pack('=L', - ipv4cfg.get_addresses()[0].get_gateway())) - self._set_device_info_value(dt, "route", gateway) - if dt == "wired": - prefix = ipv4cfg.get_addresses()[0].get_prefix() - nm_utils.nm_utils_ip4_prefix_to_netmask.argtypes = [ctypes.c_uint32] - nm_utils.nm_utils_ip4_prefix_to_netmask.restype = ctypes.c_uint32 - netmask = nm_utils.nm_utils_ip4_prefix_to_netmask(prefix) - netmask = socket.inet_ntoa(struct.pack('=L', netmask)) - self._set_device_info_value(dt, "subnet", netmask) + ipv4cfg = nm_device_ip_config(device.get_iface(), version=4) + ipv6cfg = nm_device_ip_config(device.get_iface(), version=6) + + if ipv4cfg and ipv4cfg[0]: + addr_str, prefix, gateway_str = ipv4cfg[0][0] + netmask_str = network.prefix2netmask(prefix) + dnss_str = " ".join(ipv4cfg[1]) else: - self._set_device_info_value(dt, "ipv4", None) - self._set_device_info_value(dt, "dns", None) - self._set_device_info_value(dt, "route", None) - if dt == "wired": - self._set_device_info_value(dt, "subnet", None) + addr_str = dnss_str = gateway_str = netmask_str = None + self._set_device_info_value(dt, "ipv4", addr_str) + self._set_device_info_value(dt, "dns", dnss_str) + self._set_device_info_value(dt, "route", gateway_str) + if dt == "wired": + self._set_device_info_value(dt, "subnet", netmask_str) - # TODO NM_GI_BUGS - segfaults on get_addres(), get_prefix() addr6_str = "" - if ipv6cfg: - config = dbus.SystemBus().get_object(NM_SERVICE, ipv6cfg.get_path()) - for addr, _prefix, _gw in getNMObjProperty(config, ".IP6Config", "Addresses"): - ipv6_addr = nm_dbus_ay_to_ipv6(addr) - if not ipv6_addr.startswith("fe80:"): - addr6_str += "%s\n" % ipv6_addr + if ipv6cfg and ipv6cfg[0]: + for ipv6addr in ipv6cfg[0]: + addr_str, prefix, gateway_str = ipv6addr + # Do not display link-local addresses + if not addr_str.startswith("fe80:"): + addr6_str += "%s/%d\n" % (addr_str, prefix) self._set_device_info_value(dt, "ipv6", addr6_str.strip() or None) -- 1.7.11.7

2 3

[master] Problematic patch I'm not sure we want to apply
by Vratislav Podzimek 09 Sep '13

09 Sep '13

This patch adds one more step to LiveCD installations -- generating new initrd after the installation. With the DracutHostOnly feature [1] dracut now includes only one keymap to the initrd image which makes the vconsole.keymap boot option not working. Users need the keymap they used in the installation in the initrd, especially when they use LUKS. However, to save 3 MB (summed size of all keymaps) in the initrd size, all live installations would generate initrd twice -- when the kernel package is installed and at the end of the installation. Vratislav Podzimek (1): Regenerate initrd on live installations (#994180) pyanaconda/install.py | 19 +++++++++++++++---- pyanaconda/iutil.py | 5 +++++ 2 files changed, 20 insertions(+), 4 deletions(-) -- 1.7.11.7

2 6

[blivet][rhel7-branch]
by David Lehman 07 Sep '13

07 Sep '13

These are all pretty simple patches that fix bugs. Patch 3 is BS but we've supported it in the past so we're stuck with it.

2 4

[PATCH] Don't set "date of last password change" /etc/shadow field (#985572)
by Vratislav Podzimek 07 Sep '13

07 Sep '13

From: Hans de Goede <hdegoede(a)redhat.com> Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/users.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyanaconda/users.py b/pyanaconda/users.py index ba5427a..e831122 100644 --- a/pyanaconda/users.py +++ b/pyanaconda/users.py @@ -335,6 +335,8 @@ class Users: else: password = cryptPassword(kwargs["password"], algo=kwargs.get("algo", None)) self.admin.setpassUser(userEnt, password, True) + userEnt.set(libuser.SHADOWLASTCHANGE, "") + self.admin.modifyUser(userEnt) elif pw == "": # Setup the account with *NO* password self.admin.unlockUser(userEnt) @@ -410,6 +412,7 @@ class Users: if lock: self.admin.lockUser(user) + user.set(libuser.SHADOWLASTCHANGE, "") self.admin.modifyUser(user) def setRootPassword(self, password, isCrypted=False, isLocked=False, algo=None): -- 1.7.11.7

2 1

[master] Automake changes
by David Shea 07 Sep '13

07 Sep '13

Here's a handful of tweaks to the autotools files to (hopefully) make things run a little more smoothly and to avoid having to keep track of files that we don't have to. The most immediately useful is patch 7, which changes the test scripts so that they can be run from any working directory.

2 10

[initial-setup][PATCH] Read /etc/system-release to get product title (#1000426)
by Vratislav Podzimek 07 Sep '13

07 Sep '13

The /etc/system-release file contains a release name that we want to display in the UI. For GUI we can use just the product title because the string "INITIAL SETUP" is shown in the top-left corner. For TUI we should inform user that this is an initial setup of the system. Also rename the hub files not to clash with the the Python package name. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- initial_setup/gui/gui.py | 13 +++--- initial_setup/gui/hubs/__init__.py | 2 +- initial_setup/gui/hubs/initial_setup.py | 60 ---------------------------- initial_setup/gui/hubs/initial_setup_hub.py | 60 ++++++++++++++++++++++++++++ initial_setup/product.py | 31 +++++++++++++++ initial_setup/tui/hubs/__init__.py | 2 +- initial_setup/tui/hubs/initial_setup.py | 55 -------------------------- initial_setup/tui/hubs/initial_setup_hub.py | 61 +++++++++++++++++++++++++++++ initial_setup/tui/tui.py | 13 +++--- 9 files changed, 164 insertions(+), 133 deletions(-) delete mode 100644 initial_setup/gui/hubs/initial_setup.py create mode 100644 initial_setup/gui/hubs/initial_setup_hub.py create mode 100644 initial_setup/product.py delete mode 100644 initial_setup/tui/hubs/initial_setup.py create mode 100644 initial_setup/tui/hubs/initial_setup_hub.py diff --git a/initial_setup/gui/gui.py b/initial_setup/gui/gui.py index 24e5a27..3afe5da 100644 --- a/initial_setup/gui/gui.py +++ b/initial_setup/gui/gui.py @@ -1,5 +1,5 @@ from pyanaconda.ui.gui import QuitDialog, GUIObject, GraphicalUserInterface -#from .product import productName, productVersion +from initial_setup.product import product_title, is_final from .hubs import InitialSetupMainHub from pyanaconda.ui.gui.spokes import StandaloneSpoke import pyanaconda.ui.gui.spokes @@ -13,27 +13,24 @@ from di import inject, usesclassinject _ = lambda t: t N_ = lambda t: t -productTitle = lambda: "Initial Setup of Fedora" -isFinal = lambda: False - class InitialSetupQuitDialog(QuitDialog): MESSAGE = N_("Are you sure you want to quit the configuration process?\n" "You might end up with unusable system if you do.") -@inject(Gdk, productTitle = productTitle, isFinal = isFinal) +@inject(Gdk, product_title = product_title, is_final = is_final) class InitialSetupGraphicalUserInterface(GraphicalUserInterface): """This is the main Gtk based firstboot interface. It inherits from anaconda to make the look & feel as similar as possible. """ screenshots_directory = "/tmp/initial-setup-screenshots" - + @usesclassinject def __init__(self, storage, payload, instclass): GraphicalUserInterface.__init__(self, storage, payload, instclass, - productTitle, isFinal, + product_title, is_final, quitDialog = InitialSetupQuitDialog) - + def _list_hubs(self): return [InitialSetupMainHub] diff --git a/initial_setup/gui/hubs/__init__.py b/initial_setup/gui/hubs/__init__.py index 5d166d6..39d8b13 100644 --- a/initial_setup/gui/hubs/__init__.py +++ b/initial_setup/gui/hubs/__init__.py @@ -1 +1 @@ -from .initial_setup import InitialSetupMainHub +from .initial_setup_hub import InitialSetupMainHub diff --git a/initial_setup/gui/hubs/initial_setup.py b/initial_setup/gui/hubs/initial_setup.py deleted file mode 100644 index f966782..0000000 --- a/initial_setup/gui/hubs/initial_setup.py +++ /dev/null @@ -1,60 +0,0 @@ -from pyanaconda.ui.gui.hubs import Hub -from pyanaconda.ui.gui.spokes import Spoke -from pyanaconda.ui.common import collect -import os - -__all__ = ["InitialSetupMainHub"] - -def collect_spokes(mask_paths): - """Return a list of all spoke subclasses that should appear for a given - category. Look for them in files imported as module_path % basename(f) - - :param mask_paths: list of mask, path tuples to search for classes - :type mask_paths: list of (mask, path) - - :return: list of Spoke classes belonging to category - :rtype: list of Spoke classes - - """ - spokes = [] - for mask, path in mask_paths: - spokes.extend(collect(mask, path, - lambda obj: issubclass(obj, Spoke) and obj.should_run("firstboot", None))) - - print spokes - return spokes - - -class InitialSetupMainHub(Hub): - uiFile = "initial_setup.glade" - builderObjects = ["summaryWindow"] - mainWidgetName = "summaryWindow" - - def _collectCategoriesAndSpokes(self): - """collects categories and spokes to be displayed on this Hub - - :return: dictionary mapping category class to list of spoke classes - :rtype: dictionary[category class] -> [ list of spoke classes ] - """ - - ret = {} - - # Collect all the categories this hub displays, then collect all the - # spokes belonging to all those categories. - candidate_spokes = collect_spokes(self.paths["spokes"]) - spokes = [spoke for spoke in candidate_spokes \ - if spoke.should_run("firstboot", self.data)] - - for spoke in spokes: - ret.setdefault(spoke.category, []) - ret[spoke.category].append(spoke) - - return ret - - @property - def continueButton(self): - return self.builder.get_object("continueButton") - - @property - def quitButton(self): - return self.builder.get_object("quitButton") diff --git a/initial_setup/gui/hubs/initial_setup_hub.py b/initial_setup/gui/hubs/initial_setup_hub.py new file mode 100644 index 0000000..d0ac15b --- /dev/null +++ b/initial_setup/gui/hubs/initial_setup_hub.py @@ -0,0 +1,60 @@ +from pyanaconda.ui.gui.hubs import Hub +from pyanaconda.ui.gui.spokes import Spoke +from pyanaconda.ui.common import collect +import os + +__all__ = ["InitialSetupMainHub"] + +def collect_spokes(mask_paths): + """Return a list of all spoke subclasses that should appear for a given + category. Look for them in files imported as module_path % basename(f) + + :param mask_paths: list of mask, path tuples to search for classes + :type mask_paths: list of (mask, path) + + :return: list of Spoke classes belonging to category + :rtype: list of Spoke classes + + """ + spokes = [] + for mask, path in mask_paths: + spokes.extend(collect(mask, path, + lambda obj: issubclass(obj, Spoke) and obj.should_run("firstboot", None))) + + print spokes + return spokes + + +class InitialSetupMainHub(Hub): + uiFile = "initial_setup.glade" + builderObjects = ["summaryWindow"] + mainWidgetName = "summaryWindow" + + def _collectCategoriesAndSpokes(self): + """collects categories and spokes to be displayed on this Hub + + :return: dictionary mapping category class to list of spoke classes + :rtype: dictionary[category class] -> [ list of spoke classes ] + """ + + ret = {} + + # Collect all the categories this hub displays, then collect all the + # spokes belonging to all those categories. + candidate_spokes = collect_spokes(self.paths["spokes"]) + spokes = [spoke for spoke in candidate_spokes \ + if spoke.should_run("firstboot", self.data)] + + for spoke in spokes: + ret.setdefault(spoke.category, []) + ret[spoke.category].append(spoke) + + return ret + + @property + def continueButton(self): + return self.builder.get_object("continueButton") + + @property + def quitButton(self): + return self.builder.get_object("quitButton") diff --git a/initial_setup/product.py b/initial_setup/product.py new file mode 100644 index 0000000..40cf45d --- /dev/null +++ b/initial_setup/product.py @@ -0,0 +1,31 @@ +"""Module providing information about the installed product.""" + +RELEASE_STRING_FILE = "/etc/system-release" + +def product_title(): + """ + Get product title. + + :return: product title + :rtype: str + + """ + + try: + with open(RELEASE_STRING_FILE, "r") as fobj: + title = fobj.readline().strip() + + return title + except IOError: + return "" + +def is_final(): + """ + Whether it is a final release of the product or not. + + :rtype: bool + + """ + + # doesn't really matter for the Initial Setup + return True diff --git a/initial_setup/tui/hubs/__init__.py b/initial_setup/tui/hubs/__init__.py index 5d166d6..39d8b13 100644 --- a/initial_setup/tui/hubs/__init__.py +++ b/initial_setup/tui/hubs/__init__.py @@ -1 +1 @@ -from .initial_setup import InitialSetupMainHub +from .initial_setup_hub import InitialSetupMainHub diff --git a/initial_setup/tui/hubs/initial_setup.py b/initial_setup/tui/hubs/initial_setup.py deleted file mode 100644 index a8521ad..0000000 --- a/initial_setup/tui/hubs/initial_setup.py +++ /dev/null @@ -1,55 +0,0 @@ -from pyanaconda.ui.tui.hubs import TUIHub -from pyanaconda.ui.tui.spokes import TUISpoke -from pyanaconda.ui.common import collect -import os - -__all__ = ["InitialSetupMainHub"] - -# localization -_ = lambda t: t -N_ = lambda t: t - -def collect_spokes(mask_paths): - """Return a list of all spoke subclasses that should appear for a given - category. Look for them in files imported as module_path % basename(f) - - :param mask_paths: list of mask, path tuples to search for classes - :type mask_paths: list of (mask, path) - - :return: list of Spoke classes belonging to category - :rtype: list of Spoke classes - - """ - spokes = [] - for mask, path in mask_paths: - spokes.extend(collect(mask, path, - lambda obj: issubclass(obj, Spoke) and obj.should_run("firstboot", None))) - - print spokes - return spokes - - -class InitialSetupMainHub(TUIHub): - categories = ["password", "localization"] - title = _("Initial setup of Fedora") - - def _collectCategoriesAndSpokes(self): - """collects categories and spokes to be displayed on this Hub - - :return: dictionary mapping category class to list of spoke classes - :rtype: dictionary[category class] -> [ list of spoke classes ] - """ - - ret = {} - - # Collect all the categories this hub displays, then collect all the - # spokes belonging to all those categories. - candidate_spokes = collect_spokes(self.paths["spokes"]) - spokes = [spoke for spoke in candidate_spokes \ - if spoke.should_run("firstboot", self.data)] - - for spoke in spokes: - ret.setdefault(spoke.category, []) - ret[spoke.category].append(spoke) - - return ret diff --git a/initial_setup/tui/hubs/initial_setup_hub.py b/initial_setup/tui/hubs/initial_setup_hub.py new file mode 100644 index 0000000..6316179 --- /dev/null +++ b/initial_setup/tui/hubs/initial_setup_hub.py @@ -0,0 +1,61 @@ +from pyanaconda.ui.tui.hubs import TUIHub +from pyanaconda.ui.tui.spokes import TUISpoke +from pyanaconda.ui.common import collect +from initial_setup import product +import os + +__all__ = ["InitialSetupMainHub"] + +# localization +_ = lambda t: t +N_ = lambda t: t + +def collect_spokes(mask_paths): + """Return a list of all spoke subclasses that should appear for a given + category. Look for them in files imported as module_path % basename(f) + + :param mask_paths: list of mask, path tuples to search for classes + :type mask_paths: list of (mask, path) + + :return: list of Spoke classes belonging to category + :rtype: list of Spoke classes + + """ + spokes = [] + for mask, path in mask_paths: + spokes.extend(collect(mask, path, + lambda obj: issubclass(obj, Spoke) and obj.should_run("firstboot", None))) + + print spokes + return spokes + + +class InitialSetupMainHub(TUIHub): + categories = ["password", "localization"] + + prod_title = product.product_title() + if prod_title: + title = _("Initial setup of %(product)s") % {"product": prod_title} + else: + title = _("Initial setup") + + def _collectCategoriesAndSpokes(self): + """collects categories and spokes to be displayed on this Hub + + :return: dictionary mapping category class to list of spoke classes + :rtype: dictionary[category class] -> [ list of spoke classes ] + """ + + ret = {} + + # Collect all the categories this hub displays, then collect all the + # spokes belonging to all those categories. + candidate_spokes = collect_spokes(self.paths["spokes"]) + spokes = [spoke for spoke in candidate_spokes \ + if spoke.should_run("firstboot", self.data)] + + for spoke in spokes: + ret.setdefault(spoke.category, []) + ret[spoke.category].append(spoke) + + return ret diff --git a/initial_setup/tui/tui.py b/initial_setup/tui/tui.py index 14b5af2..05cbd2c 100644 --- a/initial_setup/tui/tui.py +++ b/initial_setup/tui/tui.py @@ -1,5 +1,5 @@ from pyanaconda.ui.tui import TextUserInterface -#from .product import productName, productVersion +from initial_setup.product import product_title, is_final from .hubs import InitialSetupMainHub from pyanaconda.ui.tui.spokes import StandaloneSpoke import pyanaconda.ui.tui.spokes @@ -12,25 +12,22 @@ from di import inject, usesclassinject _ = lambda t: t N_ = lambda t: t -productTitle = lambda: "Initial Setup of Fedora" -isFinal = lambda: False - QUIT_MESSAGE = N_("Are you sure you want to quit the configuration process?\n" "You might end up with unusable system if you do.") -@inject(productTitle = productTitle, isFinal = isFinal) +@inject(product_title = product_title, is_final = is_final) class InitialSetupTextUserInterface(TextUserInterface): """This is the main text based firstboot interface. It inherits from anaconda to make the look & feel as similar as possible. """ ENVIRONMENT = "firstboot" - + @usesclassinject def __init__(self, storage, payload, instclass): TextUserInterface.__init__(self, storage, payload, instclass, - productTitle, isFinal, quitMessage = QUIT_MESSAGE) - + product_title, is_final, quitMessage = QUIT_MESSAGE) + def _list_hubs(self): return [InitialSetupMainHub] -- 1.7.11.7

4 11

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches September 2013