Anaconda-devel November 2010

anaconda-devel@lists.fedoraproject.org

27 participants
57 discussions

timezone tweaks
by Ales Kozumplik 09 Nov '10

09 Nov '10

The first patch is obvious. The second one, the one liner, took me all afternoon: the problem is that whenever the screen was entered the correct city was selected but not visible in the treeview, kindof like a one-off error in GTK: http://akozumpl.fedorapeople.org/tz_scroll_bad.png http://akozumpl.fedorapeople.org/tz_scroll_good.png I later found out this doesn't happen if TZ is the very first screen displayed, or more specifically whenever self.window.show() is called in gui.py before loading and creating the TZ widget. I am also able to reproduce this with different window.show() combinations (window being the containing window) locally, outside of Anaconda. Therefore, assuming this is another GTK synchronicity/sizing-estimation weirdness, I propose a patch that sets the selection upon the first rendering instead. (Nils, you are CCed just FYI in case you encounter a similar problem too.) Ales

3 6

[PATCH] Unset bootloader password checkbox (#650865)
by Brian C. Lane 09 Nov '10

09 Nov '10

When the bootloader password dialog is canceled with no password set clear the checkbox. --- pyanaconda/iw/blpasswidget.py | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pyanaconda/iw/blpasswidget.py b/pyanaconda/iw/blpasswidget.py index b524499..4b377b5 100644 --- a/pyanaconda/iw/blpasswidget.py +++ b/pyanaconda/iw/blpasswidget.py @@ -30,14 +30,14 @@ class BootloaderPasswordWidget: def __init__(self, anaconda, parent): self.parent = parent self.intf = anaconda.intf - + if anaconda.bootloader.getPassword(): usePass = 1 self.password = anaconda.bootloader.getPassword() else: usePass = 0 self.password = None - + vbox = gtk.VBox(False, 6) # password widgets + callback @@ -53,7 +53,7 @@ class BootloaderPasswordWidget: self.usePassCb.connect("toggled", self.passCallback) self.passButton.connect("clicked", self.passButtonCallback) self.setPassLabel() - + box = gtk.HBox(False, 12) box.pack_start(self.usePassCb, False) box.pack_start(self.passButton, False) @@ -73,7 +73,7 @@ class BootloaderPasswordWidget: # set the label on the button for the bootloader password def setPassLabel(self): - self.passButton.set_label(_("Change _password")) + self.passButton.set_label(_("Change _password")) if not self.usePassCb.get_active() or not self.password: self.passButton.set_sensitive(False) else: @@ -85,8 +85,8 @@ class BootloaderPasswordWidget: self.passButton.set_sensitive(False) self.setPassLabel() else: - if self.passwordWindow() == 2: - widget.set_active(0) + if not self.passwordWindow() and not self.password: + self.usePassCb.set_active(False) self.setPassLabel() # callback for when the password button is clicked @@ -101,7 +101,7 @@ class BootloaderPasswordWidget: dialog.add_button('gtk-ok', 1) dialog.set_position(gtk.WIN_POS_CENTER) gui.addFrame(dialog) - + label = gui.WrappingLabel(_("Enter a boot loader password and then confirm it. (Note that your BIOS keymap may be different than the actual keymap you are used to.)")) label.set_alignment(0.0, 0.0) dialog.vbox.pack_start(label) @@ -115,8 +115,8 @@ class BootloaderPasswordWidget: pwEntry.set_visibility (False) label.set_mnemonic_widget(pwEntry) table.attach(pwEntry, 1, 2, 2, 3, gtk.FILL, 0, 10) - label = gui.MnemonicLabel(_("Con_firm:")) - table.attach(label, 0, 1, 3, 4, gtk.FILL, 0, 10) + label = gui.MnemonicLabel(_("Con_firm:")) + table.attach(label, 0, 1, 3, 4, gtk.FILL, 0, 10) confirmEntry = gtk.Entry (16) confirmEntry.set_visibility (False) label.set_mnemonic_widget(confirmEntry) @@ -133,6 +133,7 @@ class BootloaderPasswordWidget: while 1: rc = dialog.run() if rc in [gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT]: + rc = False break if pwEntry.get_text() != confirmEntry.get_text(): @@ -157,6 +158,7 @@ class BootloaderPasswordWidget: continue self.password = thePass + rc = True break dialog.destroy() -- 1.7.3.2

2 1

[PATCH] Return mount's actual error codes instead of obfuscating them.
by David Lehman 08 Nov '10

08 Nov '10

In addition to being unnecessary, this obfuscation does not account for the fact that the codes can be combined using a bitwise or. This is part of the reason we were unable to identify the actual problem with the series of bugs involving the error "SystemError: (2, None)" during F11, F12, and perhaps after that. Related: rhbz#548592 --- pyanaconda/isys/imount.c | 43 ++++++++++--------------------------------- pyanaconda/isys/imount.h | 13 +++---------- 2 files changed, 13 insertions(+), 43 deletions(-) diff --git a/pyanaconda/isys/imount.c b/pyanaconda/isys/imount.c index ed0f5a7..1b832c0 100644 --- a/pyanaconda/isys/imount.c +++ b/pyanaconda/isys/imount.c @@ -224,27 +224,8 @@ int mountCommandWrapper(int mode, char *dev, char *where, char *fs, if (!WIFEXITED(status)) return IMOUNT_ERR_OTHER; - else if ( (rc = WEXITSTATUS(status)) ) { - /* Refer to 'man mount' for the meaning of the error codes. */ - switch (rc) { - case 1: - return IMOUNT_ERR_PERMISSIONS; - case 2: - return IMOUNT_ERR_SYSTEM; - case 4: - return IMOUNT_ERR_MOUNTINTERNAL; - case 8: - return IMOUNT_ERR_USERINTERRUPT; - case 16: - return IMOUNT_ERR_MTAB; - case 32: - return IMOUNT_ERR_MOUNTFAILURE; - case 64: - return IMOUNT_ERR_PARTIALSUCC; - default: - return IMOUNT_ERR_OTHER; - } - } + else if ( (rc = WEXITSTATUS(status)) ) + return rc; return 0; } @@ -289,20 +270,16 @@ int mkdirChain(char * origChain) { return 0; } -/* Returns true iff it is possible that the mount command that have returned - * 'errno' might succeed at a later time (think e.g. not yet initialized USB - * device, etc.) */ +/* Returns true iff it is possible that a failed mount command might + * succeed at a later time (think e.g. not yet initialized USB device, + * etc.) */ int mountMightSucceedLater(int mountRc) { - int rc; - switch (mountRc) { - case IMOUNT_ERR_MOUNTFAILURE: - rc = 1; - break; - default: - rc = 0; - } - return rc; + /* 32 is the mount exit code for "mount failure" */ + if (mountRc > 0 && mountRc & 0x20) + return 1; + else + return 0; } static int mkdirIfNone(char * directory) { diff --git a/pyanaconda/isys/imount.h b/pyanaconda/isys/imount.h index d1b7cf3..e04d3a7 100644 --- a/pyanaconda/isys/imount.h +++ b/pyanaconda/isys/imount.h @@ -20,16 +20,9 @@ #ifndef H_IMOUNT #define H_IMOUNT -#define IMOUNT_ERR_ERRNO 1 -#define IMOUNT_ERR_OTHER 2 -#define IMOUNT_ERR_MODE 3 -#define IMOUNT_ERR_PERMISSIONS 4 -#define IMOUNT_ERR_SYSTEM 5 -#define IMOUNT_ERR_MOUNTINTERNAL 6 -#define IMOUNT_ERR_USERINTERRUPT 7 -#define IMOUNT_ERR_MTAB 8 -#define IMOUNT_ERR_MOUNTFAILURE 9 -#define IMOUNT_ERR_PARTIALSUCC 10 +#define IMOUNT_ERR_ERRNO -1 +#define IMOUNT_ERR_OTHER -2 +#define IMOUNT_ERR_MODE -3 #include <sys/mount.h> /* for umount() */ -- 1.7.2.3

2 1

[PATCH 1/2] Move check for ext2 filesystem journal from FS to Ext2FS.
by David Lehman 08 Nov '10

08 Nov '10

Even though we only currently support migration of ext[23] we should keep the ext-specific code out of the base filesystem class. --- pyanaconda/storage/formats/fs.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pyanaconda/storage/formats/fs.py b/pyanaconda/storage/formats/fs.py index a0f2749..7887bd2 100644 --- a/pyanaconda/storage/formats/fs.py +++ b/pyanaconda/storage/formats/fs.py @@ -387,12 +387,6 @@ class FS(DeviceFormat): if not os.path.exists(self.device): raise FSError("device does not exist") - # if journal already exists skip - if isys.ext2HasJournal(self.device): - log.info("Skipping migration of %s, has a journal already." - % self.device) - return - argv = self._defaultMigrateOptions[:] argv.append(self.device) try: @@ -926,6 +920,12 @@ class Ext2FS(FS): return msg.strip() def doMigrate(self, intf=None): + # if journal already exists skip + if isys.ext2HasJournal(self.device): + log.info("Skipping migration of %s, has a journal already." + % self.device) + return + FS.doMigrate(self, intf=intf) self.tuneFS() -- 1.7.2.3

2 3

[PATCH] Fix variable substitution in kickstart files
by Brian C. Lane 05 Nov '10

05 Nov '10

When creating repos from kickstart files the yumvar dict needs to be passed to it, otherwise variable substitution in urls will not work. --- pyanaconda/yuminstall.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py index 437fd16..f811ac6 100644 --- a/pyanaconda/yuminstall.py +++ b/pyanaconda/yuminstall.py @@ -813,6 +813,7 @@ class AnacondaYum(yum.YumBase): ksrepo.baseurl = "file://%s" % dest repo = AnacondaYumRepo(ksrepo.name) + repo.yumvar.update(self.conf.yumvar) repo.mirrorlist = ksrepo.mirrorlist repo.name = ksrepo.name -- 1.7.3.2

2 1

[PATCH] Don't show the cleardisk dialog on upgrades (#649865).
by Chris Lumens 05 Nov '10

05 Nov '10

This has the disadvantage of making it so you cannot pick a different disk to install your bootloader to should you choose to create a new bootloader config. However, that is probably less confusing than the current situation. --- pyanaconda/upgrade.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pyanaconda/upgrade.py b/pyanaconda/upgrade.py index 5ca8789..9aa8a37 100644 --- a/pyanaconda/upgrade.py +++ b/pyanaconda/upgrade.py @@ -321,7 +321,6 @@ def setSteps(anaconda): "keyboard", "filtertype", "filter", - "cleardiskssel", "storageinit", "findrootparts", "findinstall", @@ -353,4 +352,6 @@ def setSteps(anaconda): dispatch.skipStep("bootloader") if not iutil.isX86(): - dispatch.skipStep("upgbootloader") + dispatch.skipStep("upgbootloader") + + dispatch.skipStep("cleardiskssel", permanent=1) -- 1.7.1.1

3 2

[PATCH] support other encryption algorithms for grub (#554784)
by Chris Lumens 04 Nov '10

04 Nov '10

These patches apply to master, though I will have to apply slightly modified ones to rhel6-branch as well. The pykickstart piece is already pushed. - Chris

2 4

[PATCH] Fix test for CTC devices from yesterday.
by Chris Lumens 04 Nov '10

04 Nov '10

--- pyanaconda/isys/devices.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pyanaconda/isys/devices.c b/pyanaconda/isys/devices.c index 5d509c3..a30f006 100644 --- a/pyanaconda/isys/devices.c +++ b/pyanaconda/isys/devices.c @@ -172,7 +172,7 @@ storagedone: } /* S390 channel-to-channnel devices have type 256 */ - if (type != 1 && !strncmp(ent->d_name, "ctc", 3) && type != 256) + if (type != 1 || (!strncmp(ent->d_name, "ctc", 3) && type != 256)) continue; new = calloc(1, sizeof(struct device)); -- 1.7.1.1

4 5

[PATCH] Support devices larger than 1.5TB (#649095, rspanton AT zepler DOT net).
by Chris Lumens 04 Nov '10

04 Nov '10

--- pyanaconda/isys/devices.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyanaconda/isys/devices.c b/pyanaconda/isys/devices.c index a30f006..869614e 100644 --- a/pyanaconda/isys/devices.c +++ b/pyanaconda/isys/devices.c @@ -90,7 +90,7 @@ struct device **getDevices(enum deviceType type) { continue; if (devtype == DEVICE_DISK && !(caps & GENHD_FL_REMOVABLE)) { - int size; + long long int size; snprintf(path, 64, "/sys/block/%s/size", ent->d_name); fd = open(path, O_RDONLY); @@ -104,10 +104,10 @@ struct device **getDevices(enum deviceType type) { close(fd); errno = 0; - size = strtol(buf, NULL, 10); + size = strtoll(buf, NULL, 10); - if ((errno == ERANGE && (size == LONG_MIN || - size == LONG_MAX)) || + if ((errno == ERANGE && (size == LLONG_MIN || + size == LLONG_MAX)) || (errno != 0 && size == 0)) { return NULL; } -- 1.7.1.1

3 4

Cleanup loader STEP_IP failure recovery
by James Laska 03 Nov '10

03 Nov '10

Greetings, While talking to Richard Hughes about a 'preupgrade' use case that requires networking to download stage#2 during the install process, we discussed adding boot options "ksdevice=link ip=dhcp" to get things working with no user prompts for 95% of users. For the other 5% that [do,can] not use DHCP, loader doesn't currently let you go back and choose a different interface or tweak the IP parameters once you boot with "ksdevice=____ and ip=____". Basically, you are presented with a dialog to [Retry] which won't work unless there is a DHCP server responding. To explore, and potentially correct this behavior, I tweaked net.c and loader.c to allow you to manually walk through STEP_IFACE and STEP_IP in the event that configuring the network has failed. One problem was that configureTCPIP() was using FL_IP_PARAM(flags) and FL_IPV6_PARAM(flags) to determine whether or not to setup the network. However, if those parameters didn't work, we never cleared them when network activation failed. Along with that fix, there are a few spots where we needed to clear the values so the user could be re-prompted for networking information. Also, I've adjusted that to instead use iface->ipv4Method and iface->ipv6Method. There are a few other logMessage() additions I found helpful when tracking the flow. I've tested this out using a virtual guest with multiple NICs, no dhcp server responding, different combinations of IPv6 and IPv4 networking, and networking provided as boot args and kickstart. The attached patch seems to have held up. I'm sure I'm forgetting something, so I thought I'd send this out to the list for feedback. Thanks, James

3 6

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel November 2010