[master][PATCH] Document the instl.multilib boot option
by Vratislav Podzimek
Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com>
---
docs/boot-options.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/docs/boot-options.txt b/docs/boot-options.txt
index e8317c6..10c85d4 100644
--- a/docs/boot-options.txt
+++ b/docs/boot-options.txt
@@ -93,6 +93,9 @@ This specifies the location for driver rpms. May be specified multiple times.
Locations may be specified using any of the formats allowed for
<<inst.repo,`inst.repo`>>.
+=== inst.multilib ===
+This sets yum's multilib_policy to "all" (as opposed to "best").
+
[[kickstart]]
Kickstart
---------
--
1.8.4.2
10 years, 5 months
[master][PATCH] Minor tweaks of our driver disk documentation
by Vratislav Podzimek
Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com>
---
docs/driverdisc.txt | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/docs/driverdisc.txt b/docs/driverdisc.txt
index dee3a30..d67a1cf 100644
--- a/docs/driverdisc.txt
+++ b/docs/driverdisc.txt
@@ -40,10 +40,10 @@ Selecting DD manually
There are two ways of triggering DD mode and loading updated drivers manually.
-The first is using 'dd=<location>' argument on the kernel command line during
+The first is using 'inst.dd=<location>' argument on the kernel command line during
installation boot.
-Second way is by using only 'dd' argument on the command line and then using
+Second way is by using only 'inst.dd' argument on the command line and then using
the TUI provided by anaconda to select DriverDisc's source location.
Documentation for current release will provide more details as this wasn't
@@ -57,7 +57,7 @@ kernel command line argument. This is enabled by default in Red Hat Enterprise
Linux version of Anaconda.
The DriverDisc has to be on partition or filesystem which has been labeled
-with 'oemdrv' label.
+with 'OEMDRV' label.
DDv3 structure
@@ -122,4 +122,3 @@ Summary
This new DriverDisc format should simplify the DD creation and usage a lot. We
will gladly hear any comments as this is partially still work in progress.
-
--
1.8.4.2
10 years, 5 months
[PATCH 1/2] Move PathDict into pyanaconda/ui/__init__.py.
by Chris Lumens
This is the only place it's used, so don't export it either.
---
pyanaconda/ui/__init__.py | 15 ++++++++++++++-
pyanaconda/ui/common.py | 13 -------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pyanaconda/ui/__init__.py b/pyanaconda/ui/__init__.py
index 44f27e6..b1eb060 100644
--- a/pyanaconda/ui/__init__.py
+++ b/pyanaconda/ui/__init__.py
@@ -21,8 +21,21 @@
__all__ = ["UserInterface"]
+import copy
import os
-from pyanaconda.ui.common import collect, PathDict
+from pyanaconda.ui.common import collect
+
+class PathDict(dict):
+ """Dictionary class supporting + operator"""
+ def __add__(self, ext):
+ new_dict = copy.copy(self)
+ for key, value in ext.iteritems():
+ try:
+ new_dict[key].extend(value)
+ except KeyError:
+ new_dict[key] = value[:]
+
+ return new_dict
class UserInterface(object):
"""This is the base class for all kinds of install UIs. It primarily
diff --git a/pyanaconda/ui/common.py b/pyanaconda/ui/common.py
index fc2c1e2..5e08104 100644
--- a/pyanaconda/ui/common.py
+++ b/pyanaconda/ui/common.py
@@ -23,7 +23,6 @@
import os
import imp
import inspect
-import copy
import sys
import types
@@ -34,18 +33,6 @@ from pykickstart.constants import FIRSTBOOT_RECONFIG
import logging
log = logging.getLogger("anaconda")
-class PathDict(dict):
- """Dictionary class supporting + operator"""
- def __add__(self, ext):
- new_dict = copy.copy(self)
- for key, value in ext.iteritems():
- try:
- new_dict[key].extend(value)
- except KeyError:
- new_dict[key] = value[:]
-
- return new_dict
-
class UIObject(object):
"""This is the base class from which all other UI classes are derived. It
thus contains only attributes and methods that are common to everything
--
1.8.3.1
10 years, 5 months
[f20-branch/master][PATCH] Make TUI work again
by Martin Kolman
Looks like TUI was broken by one of the recent Pylint patches,
the following patch fixes the issue while still keeping Pylint happy.
Martin Kolman (1):
Fix AttributeError in TUI
pyanaconda/ui/tui/spokes/source.py | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
--
1.8.4.2
10 years, 5 months
[rhel7-branch] Catch OSError if there are problems running authconfig. (#994674)
by Samantha N. Bueno
We were catching the wrong type of error previously, which caused a
traceback.
Resolves: rhbz#994674
---
pyanaconda/kickstart.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index d615208..1b1e3ab 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -232,7 +232,7 @@ class Authconfig(commands.authconfig.FC3_Authconfig):
try:
iutil.execWithRedirect("/usr/sbin/authconfig", args, root=ROOT_PATH)
- except RuntimeError as msg:
+ except OSError as msg:
log.error("Error running /usr/sbin/authconfig %s: %s", args, msg)
class AutoPart(commands.autopart.F20_AutoPart):
--
1.8.3.1
10 years, 5 months
[blivet-rhel7/f20/master] Make error message in setDefaultFSType more informative (#1019766)
by Anne Mulhern
Related: rhbz#1019766
This has been observed to raise a ValueError a couple of times. Want to
make the error message more informative in case it happens again.
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/__init__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/blivet/__init__.py b/blivet/__init__.py
index d3c5a8b..037c9e8 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -1765,12 +1765,12 @@ class Blivet(object):
log.debug("trying to set new default fstype to '%s'" % newtype)
fmt = getFormat(newtype)
if fmt.type is None:
- raise ValueError("unrecognized value for new default fs type")
+ raise ValueError("unrecognized value %s for new default fs type" % newtype)
if (not fmt.mountable or not fmt.formattable or not fmt.supported or
not fmt.linuxNative):
log.debug("invalid default fstype: %r" % fmt)
- raise ValueError("new value is not valid as a default fs type")
+ raise ValueError("new value %s is not valid as a default fs type" % fmt)
self._defaultFSType = newtype
--
1.8.3.1
10 years, 5 months
[PATCH] Change how we test if the GUI is available in the anaconda script.
by Chris Lumens
Simply trying to import early on means we get the "Unable to init server" and
XDG_RUNTIME_DIR errors. Instead, test to see if the GUI is available to be
imported (which it will if it's included in the tree). We can still fall back
to text mode if there are X problems, though.
---
anaconda | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/anaconda b/anaconda
index caf68a5..21b974a 100755
--- a/anaconda
+++ b/anaconda
@@ -489,10 +489,11 @@ def setupDisplay(anaconda, options, addons=None):
vncS.vncconnectport = anaconda.ksdata.vnc.port
if anaconda.displayMode == "g":
- try:
- # pylint: disable-msg=W0612
- from pyanaconda.ui.gui import GraphicalUserInterface
- except ImportError:
+ import pkgutil
+ import pyanaconda
+
+ mods = [lst[1] for lst in list(pkgutil.iter_modules(pyanaconda.ui.__path__, "pyanaconda.ui."))]
+ if "pyanaconda.ui.gui" not in mods:
stdoutLog.warning("Graphical user interface not available, falling back to text mode")
anaconda.displayMode = "t"
flags.usevnc = 0
--
1.8.3.1
10 years, 5 months
[master] Friday tests patches
by Vratislav Podzimek
These three patches try to help us with having (password) entries' visibility set
properly.
Vratislav Podzimek (3):
Put tests of .glade files into a separate directory
Add check testing visibility of password entries
Fix issues reported by the check_pw_visibility test
pyanaconda/ui/gui/spokes/advstorage/iscsi.glade | 2 +-
pyanaconda/ui/gui/spokes/lib/passphrase.glade | 2 +-
pyanaconda/ui/gui/spokes/lib/passphrase.py | 2 +-
pyanaconda/ui/gui/spokes/password.glade | 2 +-
pyanaconda/ui/gui/spokes/password.py | 2 +-
tests/Makefile.am | 8 +-
tests/accelerators/check_accelerators.py | 265 ---------------------
tests/accelerators/run_check_accelerators.sh | 22 --
tests/glade/accelerators/check_accelerators.py | 265 +++++++++++++++++++++
tests/glade/accelerators/run_check_accelerators.sh | 22 ++
tests/glade/pw_visibility/check_pw_visibility.py | 81 +++++++
.../glade/pw_visibility/run_check_pw_visibility.sh | 6 +
12 files changed, 384 insertions(+), 295 deletions(-)
delete mode 100755 tests/accelerators/check_accelerators.py
delete mode 100755 tests/accelerators/run_check_accelerators.sh
create mode 100755 tests/glade/accelerators/check_accelerators.py
create mode 100755 tests/glade/accelerators/run_check_accelerators.sh
create mode 100755 tests/glade/pw_visibility/check_pw_visibility.py
create mode 100755 tests/glade/pw_visibility/run_check_pw_visibility.sh
--
1.8.4.2
10 years, 5 months
[PATCH] Omit /dev/sr* from list-harddrives (#1032500)
by Samantha N. Bueno
Resolves: rhbz#1032500
---
data/command-stubs/list-harddrives-stub | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/command-stubs/list-harddrives-stub b/data/command-stubs/list-harddrives-stub
index 75e8f89..a0a6d34 100755
--- a/data/command-stubs/list-harddrives-stub
+++ b/data/command-stubs/list-harddrives-stub
@@ -26,7 +26,7 @@ import _ped
def main(argv):
lst = set()
- for dev in filter(lambda d: d.type != parted.DEVICE_DM, parted.getAllDevices()):
+ for dev in filter(lambda d: d.type != parted.DEVICE_DM and not d.path.startswith("/dev/sr"), parted.getAllDevices()):
if dev.path.startswith("/dev/"):
path = dev.path[5:]
else:
--
1.8.3.1
10 years, 5 months