anaconda-patches August 2014

anaconda-patches@lists.fedorahosted.org

12 participants
92 discussions

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

11 Jan '16

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

4 14

[master/rhel7-branch] On the way to checking and forcing minimum entropy
by Vratislav Podzimek 15 Sep '14

15 Sep '14

These two patches (anaconda and blivet) implement something I've proposed more than a year ago as part of my school project for requiring minimum entropy when creating new LUKS. The other part of the patchset that implements the actual entropy checking and forcing is on the way, but I'd like to make the entropy limit set outside of blivet (i.e. in anaconda) which I think is the rigth way to go, but in the same time it complicates the patch quite a lot. I'm sending these two patches in advance so that we can agree on the way how to implement this. In contrast to the very first version of the patch for using callbacks in blivet instead of forcing it to import and use our progress reporting code these patches try to make the callbacks framework much more robust. With the main focus on the callbacks being "extensible" -- i.e. new data can be passed to existing callbacks and new callbacks can be added without breaking the old code. Namedtuples are great for passing data to callbacks because we can add some more fields to them without breaking callbacks using just the old fields. The namedtuple holding the callbacks and a function to instantiate it may be a bit controversial, but let me explain the points behind this implementation: 1) as in case of callbacks' data it is easy to add new callbacks 2) the object holding the references to callbacks is opaque and read-only so if we decide to change its implementation (dict, class,...) we wouldn't have to care about any code relying on the old implementation 3) adding new callbacks is not an issue because with the function because there are default values for non-specified callbacks (namedtuple requires all fileds to be specified) Another solution would be a simple CallbacksRegister class with the default parameter values in __init__ which would store the parameters values (callbacks) as instance attributes, but these would be read-write and the by providing the class as a public API we would be forced to keep the implemenation as a class. Attempts to make it more restricted would lead to something definitely more complicated than a private namedtuple and a "factory function". Vratislav Podzimek (1): Give blivet callbacks for reporting partitioning progress pyanaconda/install.py | 24 ++++++++++++++++-------- pyanaconda/progress.py | 15 ++++++++++++++- 2 files changed, 30 insertions(+), 9 deletions(-) -- 1.9.3

4 12

[master/rhel7-branch] Minimum entropy for LUKS creation
by Vratislav Podzimek 11 Sep '14

11 Sep '14

These two patches follow the proposal for callbacks in blivet and implement the minimum entropy for LUKS creation requirement in blivet and anaconda. I've tested the changes and they work nicely, but there's an issue with the entropy dialog not being lightboxed because at the place it is called from, there's no reference to our window providing the lightbox. This may be solved by having our MainWindow as a singleton in the pyanaconda/ui/gui/__init__.py which is something I'd like to implement as a follow-up patch for this. As the discussion about blivet's callback implementation is still ongoing, this is of course not a final version of the patches. It's just a preview so that we can catch some potential desing issues. Suggestions, comments and gotchas are more than welcome. Vratislav Podzimek (1): Require minimum random data entropy when creating LUKS (#1073679) po/POTFILES.in | 3 + pyanaconda/install.py | 5 +- pyanaconda/kickstart.py | 3 +- pyanaconda/ui/gui/spokes/custom.py | 26 +++--- pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade | 66 ++++++++++++++ pyanaconda/ui/gui/spokes/lib/entropy_dialog.py | 56 ++++++++++++ pyanaconda/ui/lib/entropy.py | 103 ++++++++++++++++++++++ 7 files changed, 250 insertions(+), 12 deletions(-) create mode 100644 pyanaconda/ui/gui/spokes/lib/entropy_dialog.glade create mode 100644 pyanaconda/ui/gui/spokes/lib/entropy_dialog.py create mode 100644 pyanaconda/ui/lib/entropy.py -- 1.9.3

4 24

[master/f21-branch][PATCH] Strip suggested usernames to 8 characters
by Vratislav Podzimek 11 Sep '14

11 Sep '14

This is a practical and widely used pattern. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/users.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyanaconda/users.py b/pyanaconda/users.py index 82cd2d3..f25c8fa 100644 --- a/pyanaconda/users.py +++ b/pyanaconda/users.py @@ -192,8 +192,9 @@ def guess_username(fullname): if len(fullname) > 1: username = fullname[0].decode("utf-8")[0].lower() + username + # strip accents and make the username at most 8 characters long username = strip_accents(username).encode("utf-8") - return username + return username[0:8] class Users: def __init__ (self): -- 1.9.3

2 4

[PATCH 1/3] Require a larger /boot (#1129629).
by Chris Lumens 02 Sep '14

02 Sep '14

Things are getting bigger these days, and we should require that /boot be larger to accomodate. Note that this is not the same as the default autopart size. --- pyanaconda/storage_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/storage_utils.py b/pyanaconda/storage_utils.py index 069302c..2044bf7 100644 --- a/pyanaconda/storage_utils.py +++ b/pyanaconda/storage_utils.py @@ -166,7 +166,7 @@ def sanity_check(storage, min_ram=isys.MIN_RAM): exns = [] checkSizes = [('/usr', 250), ('/tmp', 50), ('/var', 384), - ('/home', 100), ('/boot', 75)] + ('/home', 100), ('/boot', 200)] mustbeonlinuxfs = ['/', '/var', '/tmp', '/usr', '/home', '/usr/share', '/usr/lib'] mustbeonroot = ['/bin','/dev','/sbin','/etc','/lib','/root', '/mnt', 'lost+found', '/proc'] -- 1.9.3

3 8

[anaconda][master/f21-branch][v2][PATCH 0/2] Help for every screen
by Martin Kolman 02 Sep '14

02 Sep '14

V2 of the help patch is here! :) Changes from the previous patch set: * the patch that removes the custom spoke help dialog has been dropped for now and will be pushed once we actually have some content for the new help system * the placeholders have been moved to the data/help directory and now have a Fedora* prefix * the base help path definitions have been moved to the base install class and Fedora install class * this makes it possible for different install classes to easily define their own paths * the autotools magic should now be correct (Thanks to David Shea for the feedback!) * help text content can now be translated (Anaconda now looks for /usr/share/doc/anaconda/<lang code>, there is also a fallback to default language if no content is found for current language) Things that still need to be done, but can be done once this patch set is "in" (so that it can be tested, etc.): * placeholder translation * final button design & placement Martin Kolman (2): Add a help button to every Anaconda screen Specify help file names for hubs and spokes anaconda.spec.in | 1 + data/help/FedoraPlaceholder.html | 5 ++ data/help/FedoraPlaceholderWithLinks.html | 13 +++ data/help/Makefile.am | 22 ++++++ pyanaconda/ihelp.py | 123 +++++++++++++++++++++++++++++ pyanaconda/installclass.py | 6 ++ pyanaconda/installclasses/fedora.py | 3 + pyanaconda/ui/gui/__init__.py | 12 +++ pyanaconda/ui/gui/hubs/progress.py | 1 + pyanaconda/ui/gui/hubs/summary.py | 1 + pyanaconda/ui/gui/spokes/__init__.py | 9 +++ pyanaconda/ui/gui/spokes/custom.py | 1 + pyanaconda/ui/gui/spokes/datetime_spoke.py | 1 + pyanaconda/ui/gui/spokes/filter.py | 1 + pyanaconda/ui/gui/spokes/keyboard.py | 1 + pyanaconda/ui/gui/spokes/langsupport.py | 1 + pyanaconda/ui/gui/spokes/network.py | 1 + pyanaconda/ui/gui/spokes/password.py | 1 + pyanaconda/ui/gui/spokes/software.py | 1 + pyanaconda/ui/gui/spokes/source.py | 1 + pyanaconda/ui/gui/spokes/storage.py | 1 + pyanaconda/ui/gui/spokes/user.py | 1 + pyanaconda/ui/gui/spokes/welcome.py | 1 + widgets/configure.ac | 2 +- widgets/glade/AnacondaWidgets.xml | 9 ++- widgets/src/BaseWindow.c | 48 +++++++++++ widgets/src/BaseWindow.h | 3 + widgets/src/Makefile.am | 2 +- 28 files changed, 268 insertions(+), 4 deletions(-) create mode 100644 data/help/FedoraPlaceholder.html create mode 100644 data/help/FedoraPlaceholderWithLinks.html create mode 100644 data/help/Makefile.am create mode 100644 pyanaconda/ihelp.py -- 1.9.3

4 18

[master/rhel7] Remove logging to tty3 and tty5 (#1073336)
by Brian C. Lane 01 Sep '14

01 Sep '14

tmux handles tailing the relevant logs in other windows, there is no need to be writing directly to a tty any longer. It also interferes with the host system when running anaconda using --image or --dirinstall from the cmdline. Resolves: rhbz#1073336 --- anaconda | 2 +- pyanaconda/anaconda_log.py | 19 +++---------------- pyanaconda/isys/log.c | 20 +------------------- pyanaconda/isys/log.h | 1 - pyanaconda/kickstart.py | 6 +++--- pyanaconda/network.py | 5 ----- 6 files changed, 8 insertions(+), 45 deletions(-) diff --git a/anaconda b/anaconda index ffce0f0..edaf097 100755 --- a/anaconda +++ b/anaconda @@ -348,7 +348,7 @@ def setupEnvironment(): def setupLoggingFromOpts(options): if options.loglevel and anaconda_log.logLevelMap.has_key(options.loglevel): level = anaconda_log.logLevelMap[options.loglevel] - anaconda_log.logger.tty_loglevel = level + anaconda_log.logger.loglevel = level anaconda_log.setHandlersLevel(log, level) storage_log = logging.getLogger("storage") anaconda_log.setHandlersLevel(storage_log, level) diff --git a/pyanaconda/anaconda_log.py b/pyanaconda/anaconda_log.py index e2d6fa5..4f678d8 100644 --- a/pyanaconda/anaconda_log.py +++ b/pyanaconda/anaconda_log.py @@ -31,16 +31,13 @@ import warnings from pyanaconda.flags import flags -DEFAULT_TTY_LEVEL = logging.INFO +DEFAULT_LEVEL = logging.INFO ENTRY_FORMAT = "%(asctime)s,%(msecs)03d %(levelname)s %(name)s: %(message)s" -TTY_FORMAT = "%(levelname)s %(name)s: %(message)s" STDOUT_FORMAT = "%(asctime)s %(message)s" DATE_FORMAT = "%H:%M:%S" MAIN_LOG_FILE = "/tmp/anaconda.log" -MAIN_LOG_TTY = "/dev/tty3" PROGRAM_LOG_FILE = "/tmp/program.log" -PROGRAM_LOG_TTY = "/dev/tty5" STORAGE_LOG_FILE = "/tmp/storage.log" PACKAGING_LOG_FILE = "/tmp/packaging.log" ANACONDA_SYSLOG_FACILITY = SysLogHandler.LOG_LOCAL1 @@ -80,7 +77,7 @@ class AnacondaLog: VIRTIO_PORT = "/dev/virtio-ports/org.fedoraproject.anaconda.log.0" def __init__ (self): - self.tty_loglevel = DEFAULT_TTY_LEVEL + self.loglevel = DEFAULT_LEVEL self.remote_syslog = None # Rename the loglevels so they are the same as in syslog. logging.addLevelName(logging.WARNING, "WARN") @@ -102,22 +99,12 @@ class AnacondaLog: for logr in [self.anaconda_logger, storage_logger]: logr.setLevel(logging.DEBUG) self.forwardToSyslog(logr) - # Logging of basic stuff and storage to tty3. - # XXX Use os.uname here since it's too early to be importing the - # storage module. - if not os.uname()[4].startswith('s390') and os.access(MAIN_LOG_TTY, os.W_OK): - self.addFileHandler(MAIN_LOG_TTY, logr, - fmtStr=TTY_FORMAT, - autoLevel=True) # External program output log program_logger = logging.getLogger("program") program_logger.setLevel(logging.DEBUG) self.addFileHandler(PROGRAM_LOG_FILE, program_logger, minLevel=logging.DEBUG) - self.addFileHandler(PROGRAM_LOG_TTY, program_logger, - fmtStr=TTY_FORMAT, - autoLevel=True) self.forwardToSyslog(program_logger) # Create the packaging logger. @@ -151,7 +138,7 @@ class AnacondaLog: fmtStr=STDOUT_FORMAT, minLevel=logging.INFO) # Add a simple handler - file or stream, depending on what we're given. - def addFileHandler (self, dest, addToLogger, minLevel=DEFAULT_TTY_LEVEL, + def addFileHandler (self, dest, addToLogger, minLevel=DEFAULT_LEVEL, fmtStr=ENTRY_FORMAT, autoLevel=False): try: diff --git a/pyanaconda/isys/log.c b/pyanaconda/isys/log.c index 9c9d5bb..aa285dc 100644 --- a/pyanaconda/isys/log.c +++ b/pyanaconda/isys/log.c @@ -34,10 +34,8 @@ #include "log.h" -static FILE * main_log_tty = NULL; static FILE * main_log_file = NULL; static FILE * program_log_file = NULL; -static loglevel_t minLevel = INFO; static const char * main_tag = "anaconda"; static const char * program_tag = "program"; static const int syslog_facility = LOG_LOCAL1; @@ -104,12 +102,9 @@ static void retagSyslog(const char* new_tag) } void logMessageV(enum logger_t logger, loglevel_t level, const char * s, va_list ap) { - FILE *log_tty = main_log_tty; FILE *log_file = main_log_file; const char *tag = main_tag; if (logger == PROGRAM_LOG) { - /* tty output is done directly for programs */ - log_tty = NULL; log_file = program_log_file; tag = program_tag; /* close and reopen syslog so we get the tagging right */ @@ -122,12 +117,7 @@ void logMessageV(enum logger_t logger, loglevel_t level, const char * s, va_list vsyslog(mapLogLevel(level), s, apc); va_end(apc); - /* Only log to the screen things that are above the minimum level. */ - if (main_log_tty && level >= minLevel && log_tty) { - printLogMessage(level, tag, log_tty, s, ap); - } - - /* But log everything to the file. */ + /* Log everything to the file. */ if (main_log_file) { printLogMessage(level, tag, log_file, s, ap); } @@ -145,7 +135,6 @@ void logMessage(loglevel_t level, const char * s, ...) { va_end(args); } -int tty_logfd = -1; int file_logfd = -1; void openLog() { @@ -154,16 +143,9 @@ void openLog() { openlog(main_tag, 0, syslog_facility); int flags; - main_log_tty = fopen("/dev/tty3", "a"); main_log_file = fopen("/tmp/anaconda.log", "a"); program_log_file = fopen("/tmp/program.log", "a"); - if (main_log_tty) { - tty_logfd = fileno(main_log_tty); - flags = fcntl(tty_logfd, F_GETFD, 0) | FD_CLOEXEC; - fcntl(tty_logfd, F_SETFD, flags); - } - if (main_log_file) { file_logfd = fileno(main_log_file); flags = fcntl(file_logfd, F_GETFD, 0) | FD_CLOEXEC; diff --git a/pyanaconda/isys/log.h b/pyanaconda/isys/log.h index f095f44..8e050a9 100644 --- a/pyanaconda/isys/log.h +++ b/pyanaconda/isys/log.h @@ -42,7 +42,6 @@ void logMessage(loglevel_t level, const char * s, ...) __attribute__ ((format (printf, 2, 3))); void openLog(); -extern int tty_logfd; extern int file_logfd; #endif /* _LOG_H_ */ diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 977d9a0..a210a22 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -73,7 +73,7 @@ log = logging.getLogger("anaconda") stderrLog = logging.getLogger("anaconda.stderr") storage_log = logging.getLogger("blivet") stdoutLog = logging.getLogger("anaconda.stdout") -from pyanaconda.anaconda_log import logger, logLevelMap, setHandlersLevel, DEFAULT_TTY_LEVEL +from pyanaconda.anaconda_log import logger, logLevelMap, setHandlersLevel, DEFAULT_LEVEL class AnacondaKSScript(KSScript): """ Execute a kickstart script @@ -920,10 +920,10 @@ class LogVolData(commands.logvol.F20_LogVolData): class Logging(commands.logging.FC6_Logging): def execute(self, *args): - if logger.tty_loglevel == DEFAULT_TTY_LEVEL: + if logger.loglevel == DEFAULT_LEVEL: # not set from the command line level = logLevelMap[self.level] - logger.tty_loglevel = level + logger.loglevel = level setHandlersLevel(log, level) setHandlersLevel(storage_log, level) diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 144548d..f0b22bf 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -70,11 +70,6 @@ def setup_ifcfg_log(): logger = logging.getLogger("ifcfg") logger.setLevel(logging.DEBUG) anaconda_log.logger.addFileHandler(ifcfgLogFile, logger, logging.DEBUG) - if os.access("/dev/tty3", os.W_OK): - anaconda_log.logger.addFileHandler("/dev/tty3", logger, - anaconda_log.DEFAULT_TTY_LEVEL, - anaconda_log.TTY_FORMAT, - autoLevel=True) anaconda_log.logger.forwardToSyslog(logger) ifcfglog = logging.getLogger("ifcfg") -- 1.9.3

4 3

[PATCH] Fix two problems with the volume label and combo on custom partitioning.
by Chris Lumens 30 Aug '14

30 Aug '14

These are both caused by the fact that we reset the label's text away from what is defined in glade. (1) Keep the colon on the end of the label. (2) Change the label's accelerator key to V, which does conflict with the remove button but we can't use keyboard accelerators to activate those buttons anyway. --- pyanaconda/ui/gui/spokes/custom.glade | 2 +- pyanaconda/ui/gui/spokes/custom.py | 15 ++++++++------- .../ui/gui/spokes/lib/custom_storage_helpers.py | 21 ++++++++++++--------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index 9143b1d..8b46847 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -485,7 +485,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes" context="GUI|Custom Partitioning|Configure">Volume _Group:</property> + <property name="label" translatable="yes" context="GUI|Custom Partitioning|Configure">_Volume Group:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">containerCombo</property> <attributes> diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 8380c3e..44b7943 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -80,7 +80,7 @@ from pyanaconda.ui.gui.spokes.lib.summary import ActionSummaryDialog from pyanaconda.ui.gui.spokes.lib.custom_storage_helpers import size_from_entry from pyanaconda.ui.gui.spokes.lib.custom_storage_helpers import validate_label, validate_mountpoint, get_raid_level from pyanaconda.ui.gui.spokes.lib.custom_storage_helpers import selectedRaidLevel, raidLevelSelection, defaultRaidLevel, requiresRaidSelection, containerRaidLevelsSupported, raidLevelsSupported, defaultContainerRaidLevel -from pyanaconda.ui.gui.spokes.lib.custom_storage_helpers import get_container_type_name, RAID_NOT_ENOUGH_DISKS +from pyanaconda.ui.gui.spokes.lib.custom_storage_helpers import get_container_type, RAID_NOT_ENOUGH_DISKS from pyanaconda.ui.gui.spokes.lib.custom_storage_helpers import AddDialog, ConfirmDeleteDialog, DisksDialog, ContainerDialog, HelpDialog from pyanaconda.ui.gui.utils import setViewportBackground, fancy_set_sensitive, ignoreEscape @@ -2042,8 +2042,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): return device_type = self._get_current_device_type() - container_type = get_container_type_name(device_type).lower() - new_text = _(NEW_CONTAINER_TEXT) % {"container_type": container_type} + container_type_name = get_container_type(device_type).name.lower() + new_text = _(NEW_CONTAINER_TEXT) % {"container_type": container_type_name} create_new_container = container_name == new_text if create_new_container: # run the vg editor dialog with a default name and disk set @@ -2317,8 +2317,9 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): if container: container_size_policy = container.size_policy - container_type_text = get_container_type_name(device_type) - self._containerLabel.set_text(container_type_text.title()) + container_type = get_container_type(device_type) + self._containerLabel.set_text(container_type.label.title()) + self._containerLabel.set_use_underline(True) self._containerStore.clear() if device_type == DEVICE_TYPE_BTRFS: containers = self._storage_playground.btrfsVolumes @@ -2344,8 +2345,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): self._containerStore.append(self._container_store_row(default_container_name)) self._containerCombo.set_active(len(self._containerStore) - 1) - self._containerStore.append(self._container_store_row(_(NEW_CONTAINER_TEXT) % {"container_type": container_type_text.lower()})) - self._containerCombo.set_tooltip_text(_(CONTAINER_TOOLTIP) % {"container_type": container_type_text.lower()}) + self._containerStore.append(self._container_store_row(_(NEW_CONTAINER_TEXT) % {"container_type": container_type.name.lower()})) + self._containerCombo.set_tooltip_text(_(CONTAINER_TOOLTIP) % {"container_type": container_type.name.lower()}) if default_container_name is None: self._containerCombo.set_active(len(self._containerStore) - 1) diff --git a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py index 6f6a1e9..fc99981 100644 --- a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py +++ b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py @@ -27,10 +27,11 @@ __all__ = ["size_from_entry", "populate_mountpoint_store", "validate_label", "validate_mountpoint", "get_raid_level", "selectedRaidLevel", "raidLevelSelection", "defaultRaidLevel", "requiresRaidSelection", "defaultContainerRaidLevel", - "containerRaidLevelsSupported", "raidLevelsSupported", "get_container_type_name", + "containerRaidLevelsSupported", "raidLevelsSupported", "get_container_type", "AddDialog", "ConfirmDeleteDialog", "DisksDialog", "ContainerDialog", "HelpDialog"] +from collections import namedtuple import functools import re @@ -68,9 +69,11 @@ CONTAINER_DIALOG_TITLE = N_("CONFIGURE %(container_type)s") CONTAINER_DIALOG_TEXT = N_("Please create a name for this %(container_type)s " "and select at least one disk below.") -CONTAINER_TYPE_NAMES = {DEVICE_TYPE_LVM: N_("Volume Group"), - DEVICE_TYPE_LVM_THINP: N_("Volume Group"), - DEVICE_TYPE_BTRFS: N_("Volume")} +ContainerType = namedtuple("ContainerType", ["name", "label"]) + +CONTAINER_TYPES = {DEVICE_TYPE_LVM: ContainerType(N_("Volume Group"), N_("_Volume Group:")), + DEVICE_TYPE_LVM_THINP: ContainerType(N_("Volume Group"), N_("_Volume Group:")), + DEVICE_TYPE_BTRFS: ContainerType(N_("Volume"), N_("_Volume:"))} # These cannot be specified as mountpoints system_mountpoints = ["/dev", "/proc", "/run", "/sys"] @@ -283,8 +286,8 @@ def containerRaidLevelsSupported(device_type): return get_supported_raid_levels(DEVICE_TYPE_BTRFS).intersection(supported) return set() -def get_container_type_name(device_type): - return CONTAINER_TYPE_NAMES.get(device_type, _("container")) +def get_container_type(device_type): + return CONTAINER_TYPES.get(device_type, ContainerType(_("container"), _("container"))) class AddDialog(GUIObject): builderObjects = ["addDialog", "mountPointStore", "mountPointCompletion", "mountPointEntryBuffer"] @@ -462,11 +465,11 @@ class ContainerDialog(GUIObject, GUIDialogInputCheckHandler): self._grabObjects() # set up the dialog labels with device-type-specific text - container_type = get_container_type_name(self.device_type) - title_text = _(CONTAINER_DIALOG_TITLE) % {"container_type": container_type.upper()} + container_type = get_container_type(self.device_type) + title_text = _(CONTAINER_DIALOG_TITLE) % {"container_type": container_type.name.upper()} self._title_label.set_text(title_text) - dialog_text = _(CONTAINER_DIALOG_TEXT) % {"container_type": container_type.lower()} + dialog_text = _(CONTAINER_DIALOG_TEXT) % {"container_type": container_type.name.lower()} self._dialog_label.set_text(dialog_text) # populate the dialog widgets -- 1.9.3

2 1

[master/rhel7-branch] Free space snapshot for swap suggestions
by Vratislav Podzimek 29 Aug '14

29 Aug '14

These two patches implement and use free space snapshot in blivet in order to make swap suggestions based on 10 % of available disk space work. Vratislav Podzimek (1): Create and use free space snapshot for swap suggestion (#1132436) pyanaconda/kickstart.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 1.9.3

2 5

[PATCH 0/2] #1122081 related patches
by Anne Mulhern 29 Aug '14

29 Aug '14

mulhern (2): Make _filterDevices() return a generator consistently (#1122081) Make prefering leaves the default in getDeviceByPath (#1122081) blivet/devicetree.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) -- 1.9.3

2 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches August 2014