Anaconda-devel March 2011

anaconda-devel@lists.fedoraproject.org

22 participants
107 discussions

[PATCH] Improve the translatability of strings with more than one format specifier.
by Chris Lumens 31 Mar '11

31 Mar '11

--- pyanaconda/installinterfacebase.py | 12 +++++------- pyanaconda/iw/filter_gui.py | 2 +- pyanaconda/iw/partition_gui.py | 4 ++-- pyanaconda/iw/upgrade_swap_gui.py | 7 ++++--- pyanaconda/platform.py | 4 ++-- pyanaconda/rescue.py | 3 +-- pyanaconda/storage/__init__.py | 23 ++++++++++++----------- pyanaconda/storage/devices.py | 6 +++--- pyanaconda/text.py | 2 +- pyanaconda/textw/constants_text.py | 2 +- pyanaconda/textw/upgrade_text.py | 7 ++++--- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pyanaconda/installinterfacebase.py b/pyanaconda/installinterfacebase.py index 4f55103..898c863 100644 --- a/pyanaconda/installinterfacebase.py +++ b/pyanaconda/installinterfacebase.py @@ -69,13 +69,11 @@ class InstallInterfaceBase(object): self._warnedUnusedRaidMembers.extend(unusedRaidMembers) unusedRaidMembers.sort() self.messageWindow(_("Warning"), - P_("Disk %s contains BIOS RAID metadata, but is not part of " - "any recognized BIOS RAID sets. Ignoring disk %s.", - "Disks %s contain BIOS RAID metadata, but are not part of " - "any recognized BIOS RAID sets. Ignoring disks %s.", - len(unusedRaidMembers)) % - (", ".join(unusedRaidMembers), - ", ".join(unusedRaidMembers)), + P_("Disk %(unusedRaidMems)s contains BIOS RAID metadata, but is not part of " + "any recognized BIOS RAID sets. Ignoring disk %(unusedRaidMems)s.", + "Disks %(unusedRaidMems)s contain BIOS RAID metadata, but are not part of " + "any recognized BIOS RAID sets. Ignoring disks %(unusedRaidMems)s.", + len(unusedRaidMembers)) % {"unusedRaidMems": ", ".join(unusedRaidMembers)}, custom_icon="warning") def resetInitializeDiskQuestion(self): diff --git a/pyanaconda/iw/filter_gui.py b/pyanaconda/iw/filter_gui.py index a0d99a2..69098c3 100644 --- a/pyanaconda/iw/filter_gui.py +++ b/pyanaconda/iw/filter_gui.py @@ -148,7 +148,7 @@ class Callbacks(object): global selectedDevices, totalDevices global selectedSize, totalSize - self.sizeLabel.set_markup(_("Selected devices: %s (%s MB) out of %s (%s MB).") % (selectedDevices, selectedSize, totalDevices, totalSize)) + self.sizeLabel.set_markup(_("Selected devices: %(selectedDevices)s (%(selectedSize)s MB) out of %(totalDevices)s (%(totalSize)s MB).") % {"selectedDevices": selectedDevices, "selectedSize": selectedSize, "totalDevices": totalDevices, "totalSize": totalSize}) def visible(self, model, iter, view): # Most basic visibility function - does the model say this row diff --git a/pyanaconda/iw/partition_gui.py b/pyanaconda/iw/partition_gui.py index 2a2ce97..6d539fb 100644 --- a/pyanaconda/iw/partition_gui.py +++ b/pyanaconda/iw/partition_gui.py @@ -447,7 +447,7 @@ class LVMStripeGraph(StripeGraph): def _createStripe(self, vg): # Create the stripe - vgtext = _("LVM Volume Group %s (%-0.f MB)") % (vg.name, vg.size) + vgtext = _("LVM Volume Group %(vgName)s (%(vgSize)-0.f MB)") % {"vgName", vg.name, "vgSize": vg.size} stripe = Stripe(self.getCanvas(), vgtext, self.dcCB, obj = vg) # Create the slices. @@ -513,7 +513,7 @@ class MDRaidArrayStripeGraph(StripeGraph): self.setDisplayed(md) def _createStripe(self, md): - mdtext = _("MD RAID ARRAY %s (%-0.f MB)") % (md.path, md.size) + mdtext = _("MD RAID ARRAY %(mdPath)s (%(mdSize)-0.f MB)") % {"mdPath": md.path, "mdSize": md.size} stripe = Stripe(self.getCanvas(), mdtext, self.dcCB, obj = md) # Since we can't really create subslices with md devices we will only diff --git a/pyanaconda/iw/upgrade_swap_gui.py b/pyanaconda/iw/upgrade_swap_gui.py index ddb8735..a998154 100644 --- a/pyanaconda/iw/upgrade_swap_gui.py +++ b/pyanaconda/iw/upgrade_swap_gui.py @@ -89,10 +89,11 @@ class UpgradeSwapWindow (InstallWindow): box = gtk.VBox (False, 5) box.set_border_width (5) - label = gtk.Label(_("You currently have %dMB of swap configured, which " - "is less than the recommended miminum of %sMB. You " + label = gtk.Label(_("You currently have %(swapAmount)dMB of swap configured, which " + "is less than the recommended miminum of %(swapSuggestion)sMB. You " "may optionally create more swap space on one of " - "your file systems now.") % (iutil.swapAmount()/1024, iutil.swapSuggestion()[0]/1024)) + "your file systems now.") % {"swapAmount": iutil.swapAmount()/1024, + "swapSuggestion": iutil.swapSuggestion()[0]/1024}) label.set_alignment (0.5, 0.0) label.set_line_wrap (True) diff --git a/pyanaconda/platform.py b/pyanaconda/platform.py index 3942887..9e636df 100644 --- a/pyanaconda/platform.py +++ b/pyanaconda/platform.py @@ -258,8 +258,8 @@ class EFI(Platform): labelType = self.diskLabelType(partedDisk.device.type) # Allow using gpt with x86, but not msdos with EFI if partedDisk.type != labelType and partedDisk.type != "gpt": - errors.append(_("%s must have a %s disk label.") - % (p.disk.name, labelType.upper())) + errors.append(_("%(disk)s must have a %(labelType)s disk label.") + % {"disk": p.disk.name, "labelType": labelType.upper()}) return errors diff --git a/pyanaconda/rescue.py b/pyanaconda/rescue.py index f6e55dc..245a597 100644 --- a/pyanaconda/rescue.py +++ b/pyanaconda/rescue.py @@ -455,8 +455,7 @@ def runRescue(anaconda): ButtonChoiceWindow(screen, _("Rescue"), _("An error occurred trying to mount some or all of your " "system. Some of it may be mounted under %s.\n\n" - "Press <return> to get a shell. %s") - % (anaconda.rootPath, msg), + "Press <return> to get a shell.") % anaconda.rootPath + msg, [_("OK")] ) else: if anaconda.ksdata and \ diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index 6c8b47d..472627c 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -1131,15 +1131,15 @@ class Storage(object): for (mount, device) in filesystems.items(): problem = filesystems[mount].checkSize() if problem < 0: - errors.append(_("Your %s partition is too small for %s formatting " - "(allowable size is %d MB to %d MB)") - % (mount, problem, device.format.name, - device.minSize, device.maxSize)) + errors.append(_("Your %(mount)s partition is too small for %(format)s formatting " + "(allowable size is %(minSize)d MB to %(maxSize)d MB)") + % {"mount": mount, "format": device.format.name, + "minSize": device.minSize, "maxSize": device.maxSize}) elif problem > 0: - errors.append(_("Your %s partition is too large for %s formatting " - "(allowable size is %d MB to %d MB)") - % (mount, problem, device.format.name, - device.minSize, device.maxSize)) + errors.append(_("Your %(mount)s partition is too large for %(format)s formatting " + "(allowable size is %(minSize)d MB to %(maxSize)d MB)") + % {"mount":mount, "format": device.format.name, + "minSize": device.minSize, "maxSize": device.maxSize}) usb_disks = [] firewire_disks = [] @@ -1180,9 +1180,10 @@ class Storage(object): if installed < required: errors.append(_("You have not specified a swap partition. " - "%s MB of memory is required to continue installation " - "without a swap partition, but you only have %s MB.") - % (int(required.convertTo(spec="MB")), int(installed.convertTo(spec="MB")))) + "%(requiredMem)s MB of memory is required to continue installation " + "without a swap partition, but you only have %(installedMem)s MB.") + % {"requiredMem": int(required.convertTo(spec="MB")), + "installedMem": int(installed.convertTo(spec="MB"))}) else: warnings.append(_("You have not specified a swap partition. " "Although not strictly required in all cases, " diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py index 97606f8..36145a3 100644 --- a/pyanaconda/storage/devices.py +++ b/pyanaconda/storage/devices.py @@ -2637,10 +2637,10 @@ class MDRaidArrayDevice(StorageDevice): # For new arrays check if we have enough members if (not exists and parents and len(parents) < mdraid.get_raid_min_members(self.level)): - raise ValueError, P_("A RAID%d set requires at least %d member", - "A RAID%d set requires at least %d members", + raise ValueError, P_("A RAID%(raidLevel)d set requires at least %(minMembers)d member", + "A RAID%(raidLevel)d set requires at least %(minMembers)d members", mdraid.get_raid_min_members(self.level)) % \ - (self.level, mdraid.get_raid_min_members(self.level)) + {"raidLevel": self.level, "minMembers": mdraid.get_raid_min_members(self.level)} self.uuid = uuid self._totalDevices = numeric_type(totalDevices) diff --git a/pyanaconda/text.py b/pyanaconda/text.py index a5dd1a5..89c858d 100644 --- a/pyanaconda/text.py +++ b/pyanaconda/text.py @@ -260,7 +260,7 @@ class InstallInterface(InstallInterfaceBase): def reinitializeWindow(self, title, path, size, description): grid = GridForm(self.screen, title, 1, 3) - text = TEXT_REINITIALIZE % (description, size, path) + text = TEXT_REINITIALIZE % {"description": description, "size": size, "devicePath": path} grid.add(TextboxReflowed(70, text), 0, 0) all_devices_cb = Checkbox(TEXT_REINITIALIZE_ALL, isOn=False) diff --git a/pyanaconda/textw/constants_text.py b/pyanaconda/textw/constants_text.py index d11b684..2563ffa 100644 --- a/pyanaconda/textw/constants_text.py +++ b/pyanaconda/textw/constants_text.py @@ -74,7 +74,7 @@ TEXT_F12_CHECK = "F12" TEXT_REINITIALIZE = _( """This storage device may contain data: -%s, %s MB, %s +%(description)s, %(size)s MB, %(devicePath)s We could not detect partitions or filesystems on this device. This could be \ because the device is blank, unpartitioned, or virtual. If not, there may be \ diff --git a/pyanaconda/textw/upgrade_text.py b/pyanaconda/textw/upgrade_text.py index 4b3152d..75f5f45 100644 --- a/pyanaconda/textw/upgrade_text.py +++ b/pyanaconda/textw/upgrade_text.py @@ -109,10 +109,11 @@ class UpgradeSwapWindow: ramDetected = iutil.memInstalled()/1024 - text = _("You currently have %dMB of swap configured, which " - "is less than the recommended miminum of %sMB. You " + text = _("You currently have %(swapAmount)dMB of swap configured, which " + "is less than the recommended miminum of %(swapSuggestion)sMB. You " "may optionally create more swap space on one of " - "your file systems now.") % (iutil.swapAmount()/1024, iutil.swapSuggestion()[0]/1024) + "your file systems now.") % {"swapAmount": iutil.swapAmount()/1024, + "swapSuggestion": iutil.swapSuggestion()[0]/1024} tb = TextboxReflowed(60, text) amount = Entry(10, scroll = 0) -- 1.7.4.1

2 1

[PATCH rhel6-branch] Don't write HWADDR into ifcfg files (#690589)
by Radek Vykydal 30 Mar '11

30 Mar '11

Not needed anymore (udev and biosdevname take care of the naming). --- iw/advanced_storage.py | 3 ++- iw/network_gui.py | 2 +- kickstart.py | 4 ++-- loader/net.c | 4 ---- network.py | 6 ++---- textw/add_drive_text.py | 2 +- textw/netconfig_text.py | 2 +- 7 files changed, 9 insertions(+), 14 deletions(-) diff --git a/iw/advanced_storage.py b/iw/advanced_storage.py index 391a6f0..799f612 100644 --- a/iw/advanced_storage.py +++ b/iw/advanced_storage.py @@ -31,6 +31,7 @@ import partIntfHelpers as pih import storage.fcoe import storage.iscsi import urlgrabber.grabber +import isys import logging log = logging.getLogger("anaconda") @@ -338,7 +339,7 @@ def addFcoeDrive(anaconda): else: desc = "%s" %(dev,) - mac = netdevs[dev].get("HWADDR") + mac = isys.getMacAddress(dev) if mac: desc = "%s - %s" %(desc, mac) diff --git a/iw/network_gui.py b/iw/network_gui.py index 702d227..1cbfbc6 100644 --- a/iw/network_gui.py +++ b/iw/network_gui.py @@ -167,7 +167,7 @@ def selectInstallNetDeviceDialog(network, devices = None): else: desc = "%s" %(dev,) - hwaddr = network.netdevices[dev].get("HWADDR") + hwaddr = isys.getMacAddress(dev) if hwaddr: desc = "%s - %s" %(desc, hwaddr,) diff --git a/kickstart.py b/kickstart.py index b7ed5c4..c604ff0 100644 --- a/kickstart.py +++ b/kickstart.py @@ -584,8 +584,8 @@ class NetworkData(commands.network.RHEL6_NetworkData): if devices.has_key(device): dev = devices[device] else: - for (key, val) in devices.iteritems(): - if val.get("HWADDR").lower() == device.lower(): + for devname in devices: + if isys.getMacAddress(devname).lower() == device.lower(): dev = val break diff --git a/loader/net.c b/loader/net.c index 725c160..993f7c5 100644 --- a/loader/net.c +++ b/loader/net.c @@ -1219,7 +1219,6 @@ int writeDisabledIfcfgFile(char *device) { } fprintf(fp, "DEVICE=%s\n", device); - fprintf(fp, "HWADDR=%s\n", iface_mac2str(device)); fprintf(fp, "ONBOOT=no\n"); fprintf(fp, "NM_CONTROLLED=no\n"); @@ -1317,9 +1316,6 @@ int writeEnabledNetInfo(iface_t *iface) { } fprintf(fp, "DEVICE=%s\n", iface->device); -#if !defined(__s390__) && !defined(__s390x__) - fprintf(fp, "HWADDR=%s\n", iface_mac2str(iface->device)); -#endif fprintf(fp, "ONBOOT=yes\n"); char *str_type = netArpTypeStr(iface); if (str_type) fprintf(fp, "TYPE=%s\n", str_type); diff --git a/network.py b/network.py index eaf2f7b..a0be4c5 100644 --- a/network.py +++ b/network.py @@ -219,8 +219,6 @@ class NetworkDevice(IfcfgFile): keys.insert(0, "DEVICE") if "KEY" in keys: keys.remove("KEY") - if iutil.isS390() and ("HWADDR" in keys): - keys.remove("HWADDR") # make sure we include autoneg in the ethtool line if 'ETHTOOL_OPTS' in keys: eopts = self.get('ETHTOOL_OPTS') @@ -353,7 +351,7 @@ class Network: if ksdevice == 'bootif' and flags.cmdline.get("BOOTIF"): bootif_mac = flags.cmdline.get("BOOTIF")[3:].replace("-", ":").upper() for dev in self.netdevices: - mac = self.netdevices[dev].get('HWADDR').upper() + mac = isys.getMacAddress(dev) if ksdevice == 'link' and isys.getLinkStatus(dev): self.ksdevice = dev break @@ -788,7 +786,7 @@ class Network: netargs += "ip=%s::%s:%s:%s:%s:none" % (dev.get('ipaddr'), gateway, netmask, hostname, nic) - hwaddr = dev.get("HWADDR") + hwaddr = isys.getMacAddress(dev) if hwaddr: if netargs != "": netargs += " " diff --git a/textw/add_drive_text.py b/textw/add_drive_text.py index 546e68d..dfc9291 100644 --- a/textw/add_drive_text.py +++ b/textw/add_drive_text.py @@ -370,7 +370,7 @@ class addDriveDialog(object): interfaceList = Listbox(height=len(devs), scroll=1) for dev in devs: - hwaddr = netdevs[dev].get("HWADDR") + hwaddr = isys.getMacAddress(dev) if hwaddr: desc = "%s - %.50s" % (dev, hwaddr) else: diff --git a/textw/netconfig_text.py b/textw/netconfig_text.py index 4f72a36..220f682 100644 --- a/textw/netconfig_text.py +++ b/textw/netconfig_text.py @@ -77,7 +77,7 @@ class NetworkConfiguratorText: ksdevice = ksdevice.get("DEVICE") for devname in devnames: - hwaddr = self.netdevs[devname].get("HWADDR") + hwaddr = isys.getMacAddress(dev) if hwaddr: desc = "%s - %.50s" % (devname, hwaddr) -- 1.7.4

4 4

[PATCH] Do not print out traceback when localedef is not present
by Martin Sivak 30 Mar '11

30 Mar '11

This skips the atexit handlers we have in the failed forked copy to prevent confusing traceback to be printed out. This shouldn't ever happen in proper install image, but we have seen it happen in one mangled test compose. --- loader/lang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/lang.c b/loader/lang.c index f3e00df..1c7a68c 100644 --- a/loader/lang.c +++ b/loader/lang.c @@ -299,7 +299,7 @@ static int setupLanguage(int choice, int forced) { "-i", locale_p, "-f", (locale_charset) ? locale_charset : "UTF-8", languages[choice].lc_all, NULL); - exit(254); + _exit(254); } if (localedef_pid < 0) logMessage(ERROR, "failed forking localedef for %s", languages[choice].lc_all); -- 1.7.4

2 1

No root user
by Martin Gracik 30 Mar '11

30 Mar '11

So, where are we standing on the "no root user" issue? If I remember correctly the last discussion didn't end with a Yes or No answer. -- Martin Gracik <mgracik(a)redhat.com>

5 6

[rhel6-branch] two more fixes for /boot on LVM on s390x
by David Cantrell 30 Mar '11

30 Mar '11

Date: Tue, 29 Mar 2011 10:09:29 -1000 1) Prevent /boot lv requests on s390 from being larger than any available pv in the vg. 2) Prevents users from installing on a system with only / as an lv. We need /boot as an lv or regular partition -or- / as a regular partition on s390x. For master as well. -- David Cantrell <dcantrell(a)redhat.com> Supervisor, Installer Engineering Team Red Hat, Inc. | Honolulu, HI | UTC-10

2 3

[rhel6-branch] two more fixes for /boot on LVM on s390x
by David Cantrell 29 Mar '11

29 Mar '11

1) Prevent /boot lv requests on s390 from being larger than any available pv in the vg. 2) Prevents users from installing on a system with only / as an lv. We need /boot as an lv or regular partition -or- / as a regular partition on s390x. For master as well. -- David Cantrell <dcantrell(a)redhat.com> Supervisor, Installer Engineering Team Red Hat, Inc. | Honolulu, HI | UTC-10

1 0

[PATCH master f15-branch] Fix the logic surrounding use of the filterfunc for get_file_list (#691880).
by Chris Lumens 29 Mar '11

29 Mar '11

Everywhere this function is used, we expect that a return value of 1 means "include the entry" and 0 means "omit it". However, that's not how get_file_list behaves. So fix it to do so, and then document the behavior. --- loader/dirbrowser.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/loader/dirbrowser.c b/loader/dirbrowser.c index ba0a6e8..18d6cdb 100644 --- a/loader/dirbrowser.c +++ b/loader/dirbrowser.c @@ -53,6 +53,13 @@ static int simpleStringCmp(const void * a, const void * b) { #define FSTEP 10 +/* Return a list of the contents of a directory, non-recursively. + * + * dirname -- The directory to list. + * filterfunc -- An optional function to use for filtering out the results. + * If this function returns 1, the directory is included. + * Otherwise, it is omitted. + */ char ** get_file_list(char * dirname, filterfunc_t filterfunc) { DIR * dir; struct dirent *entry; @@ -72,7 +79,7 @@ char ** get_file_list(char * dirname, filterfunc_t filterfunc) { continue; if ((strlen(entry->d_name) == 2) && !strncmp(entry->d_name, "..", 2)) continue; - if (filterfunc && filterfunc(dirname, entry)) + if (filterfunc && !filterfunc(dirname, entry)) continue; files[i] = strdup(entry->d_name); -- 1.7.4.1

2 1

[PATCH] Update our storage/crypto interface to use new cryptsetup API
by Martin Sivak 29 Mar '11

29 Mar '11

--- pyanaconda/storage/devicelibs/crypto.py | 136 +++++++++---------------------- 1 files changed, 40 insertions(+), 96 deletions(-) diff --git a/pyanaconda/storage/devicelibs/crypto.py b/pyanaconda/storage/devicelibs/crypto.py index 84b055a..049bc2a 100644 --- a/pyanaconda/storage/devicelibs/crypto.py +++ b/pyanaconda/storage/devicelibs/crypto.py @@ -55,139 +55,83 @@ def askyes(question): def dolog(priority, text): pass +def askpassphrase(text): + return None + def is_luks(device): - cs = CryptSetup(yesDialog = askyes, logFunc = dolog) - return cs.isLuks(device) + cs = CryptSetup(device=device, yesDialog = askyes, logFunc = dolog, passwordDialog = askpassphrase) + return cs.isLuks() def luks_uuid(device): - cs = CryptSetup(yesDialog = askyes, logFunc = dolog) - return cs.luksUUID(device).strip() + cs = CryptSetup(device=device, yesDialog = askyes, logFunc = dolog, passwordDialog = askpassphrase) + return cs.luksUUID() def luks_status(name): """True means active, False means inactive (or non-existent)""" - cs = CryptSetup(yesDialog = askyes, logFunc = dolog) - return cs.luksStatus(name)!=0 + cs = CryptSetup(name=name, yesDialog = askyes, logFunc = dolog, passwordDialog = askpassphrase) + return cs.status() def luks_format(device, - passphrase=None, key_file=None, + passphrase=None, cipher=None, key_size=None): - cs = CryptSetup(yesDialog = askyes, logFunc = dolog) - key_file_unlink = False - - if passphrase: - key_file = cs.prepare_passphrase_file(passphrase) - key_file_unlink = True - elif key_file and os.path.isfile(key_file): - pass - else: - raise ValueError("luks_format requires either a passphrase or a key file") + if not passphrase: + raise ValueError("luks_format requires passphrase") + cs = CryptSetup(device=device, yesDialog = askyes, logFunc = dolog, passwordDialog = askpassphrase) #None is not considered as default value and pycryptsetup doesn't accept it #so we need to filter out all Nones kwargs = {} - kwargs["device"] = device + kwargs["passphrase"] = passphrase if cipher: kwargs["cipher"] = cipher - if key_file: kwargs["keyfile"] = key_file - if key_size: kwargs["keysize"] = key_size + if cipher: kwargs["cipherMode"] = cipherMode + if key_size: kwargs["keysize"] = key_size rc = cs.luksFormat(**kwargs) - if key_file_unlink: os.unlink(key_file) - if rc: raise CryptoError("luks_format failed for '%s'" % device) -def luks_open(device, name, passphrase=None, key_file=None): - cs = CryptSetup(yesDialog = askyes, logFunc = dolog) - key_file_unlink = False +def luks_open(device, name, passphrase=None): + if not passphrase: + raise ValueError("luks_format requires passphrase") - if passphrase: - key_file = cs.prepare_passphrase_file(passphrase) - key_file_unlink = True - elif key_file and os.path.isfile(key_file): - pass - else: - raise ValueError("luks_open requires either a passphrase or a key file") + cs = CryptSetup(device=device, yesDialog = askyes, logFunc = dolog, passwordDialog = askpassphrase) - rc = cs.luksOpen(device = device, name = name, keyfile = key_file) - if key_file_unlink: os.unlink(key_file) + rc = cs.activate(passphrase = passphrase, name = name) if rc: raise CryptoError("luks_open failed for %s (%s)" % (device, name)) def luks_close(name): - cs = CryptSetup(yesDialog = askyes, logFunc = dolog) - rc = cs.luksClose(name) + cs = CryptSetup(name=name, yesDialog = askyes, logFunc = dolog, passwordDialog = askpassphrase) + rc = cs.deactivate() + if rc: raise CryptoError("luks_close failed for %s" % name) def luks_add_key(device, - new_passphrase=None, new_key_file=None, - passphrase=None, key_file=None): - - params = ["-q"] - - p = os.pipe() - if passphrase: - os.write(p[1], "%s\n" % passphrase) - elif key_file and os.path.isfile(key_file): - params.extend(["--key-file", key_file]) - else: - raise CryptoError("luks_add_key requires either a passphrase or a key file") - - params.extend(["luksAddKey", device]) - - if new_passphrase: - os.write(p[1], "%s\n" % new_passphrase) - elif new_key_file and os.path.isfile(new_key_file): - params.append("%s" % new_key_file) - else: - raise CryptoError("luks_add_key requires either a passphrase or a key file to add") + new_passphrase=None, + passphrase=None): - os.close(p[1]) + if not passphrase: + raise ValueError("luks_add_key requires passphrase") - rc = iutil.execWithRedirect("cryptsetup", params, - stdin = p[0], - stdout = "/dev/tty5", - stderr = "/dev/tty5") - - os.close(p[0]) + cs = CryptSetup(device=device, yesDialog = askyes, logFunc = dolog, passwordDialog = askpassphrase) + rc = cs.addPassphrase(passphrase = passphrase, newPassphrase = new_passphrase) + if rc: raise CryptoError("luks add key failed with errcode %d" % (rc,)) def luks_remove_key(device, - del_passphrase=None, del_key_file=None, - passphrase=None, key_file=None): - - params = [] - - p = os.pipe() - if del_passphrase: #the first question is about the key we want to remove - os.write(p[1], "%s\n" % del_passphrase) - - if passphrase: - os.write(p[1], "%s\n" % passphrase) - elif key_file and os.path.isfile(key_file): - params.extend(["--key-file", key_file]) - else: - raise CryptoError("luks_remove_key requires either a passphrase or a key file") + del_passphrase=None, + passphrase=None): - params.extend(["luksRemoveKey", device]) + if not passphrase: + raise ValueError("luks_remove_key requires passphrase") - if del_passphrase: - pass - elif del_key_file and os.path.isfile(del_key_file): - params.append("%s" % del_key_file) - else: - raise CryptoError("luks_remove_key requires either a passphrase or a key file to remove") - - os.close(p[1]) - - rc = iutil.execWithRedirect("cryptsetup", params, - stdin = p[0], - stdout = "/dev/tty5", - stderr = "/dev/tty5") - - os.close(p[0]) + cs = CryptSetup(device=device, yesDialog = askyes, logFunc = dolog, passwordDialog = askpassphrase) + rc = cs.removePassphrase(passphrase = new_passphrase) + if rc: - raise CryptoError("luks_remove_key failed with errcode %d" % (rc,)) + raise CryptoError("luks remove key failed with errcode %d" % (rc,)) + -- 1.7.4

2 1

[PATCH rhel5-branch] Honor kickstart noipv6 option for media installs (#677653)
by Radek Vykydal 29 Mar '11

29 Mar '11

In the media install case, /tmp/netinfo is not written, so we need to initialize useIPv6 property of device in stage 2 kickstart network command handling. Resolves: rhbz#677653 The patch is teted. --- installclass.py | 7 ++++++- kickstart.py | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/installclass.py b/installclass.py index 36665cf..46abf2f 100644 --- a/installclass.py +++ b/installclass.py @@ -256,7 +256,9 @@ class BaseInstallClass: def setAuthentication(self, id, authStr): id.auth = authStr - def setNetwork(self, id, bootProto, ip, netmask, ethtool, device = None, onboot = 1, dhcpclass = None, essid = None, wepkey = None): + def setNetwork(self, id, bootProto, ip, netmask, ethtool, device = None, + onboot = 1, dhcpclass = None, essid = None, wepkey = None, + ipv4=True, ipv6=True): if bootProto: devices = id.network.netdevices firstdev = id.network.getFirstDeviceName() @@ -293,6 +295,9 @@ class BaseInstallClass: if wepkey: dev.set(("wepkey", wepkey)) + dev.set(("useIPv4", ipv4)) + dev.set(("useIPv6", ipv6)) + def setLanguageDefault(self, id, default): id.instLanguage.setDefault(default) diff --git a/kickstart.py b/kickstart.py index 5f40e61..415ddf1 100644 --- a/kickstart.py +++ b/kickstart.py @@ -364,7 +364,8 @@ class AnacondaKSHandlers(KickstartHandlers): try: self.id.instClass.setNetwork(self.id, nd.bootProto, nd.ip, nd.netmask, nd.ethtool, nd.device, nd.onboot, - nd.dhcpclass, nd.essid, nd.wepkey) + nd.dhcpclass, nd.essid, nd.wepkey, + nd.ipv4, nd.ipv6) except KeyError: raise KickstartValueError, formatErrorMsg(self.lineno, msg="The provided network interface %s does not exist" % nd.device) -- 1.7.4

2 1

[PATCH rhel5-branch] Quote ETHTOOL_OPTS value in stage 2 (#674473)
by Radek Vykydal 29 Mar '11

29 Mar '11

From: Masahiro Matsuya <mmatsuya(a)redhat.com> Signed-off-by: Radek Vykydal <rvykydal(a)redhat.com> --- network.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/network.py b/network.py index 84776e4..ff5e06e 100644 --- a/network.py +++ b/network.py @@ -149,6 +149,8 @@ class NetworkDevice(SimpleConfigFile): # make sure we include autoneg in the ethtool line elif key == 'ETHTOOL_OPTS' and self.info[key].find("autoneg")== -1: s = s + key + """="autoneg off %s"\n""" % (self.info[key]) + elif key == 'ETHTOOL_OPTS': + s = s + key + """="%s"\n""" % (self.info[key]) elif self.info[key] is not None: s = s + key + "=" + self.info[key] + "\n" -- 1.7.4

2 1

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel March 2011