[anaconda][rhel7-branch/master][PATCH] Don't attempt terminal size detection on the s390 (#1145065)
by Martin Kolman
Resolves: rhbz#1145065
---
pyanaconda/anaconda_argparse.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/anaconda_argparse.py b/pyanaconda/anaconda_argparse.py
index c5dc78d..48c33dc 100644
--- a/pyanaconda/anaconda_argparse.py
+++ b/pyanaconda/anaconda_argparse.py
@@ -84,7 +84,15 @@ class AnacondaArgumentParser(ArgumentParser):
False: accept the argument with or without the prefix.
True: ignore the argument without the prefix. (default)
"""
- help_width = get_help_width()
+ # don't do terminal size detection on s390, it is not supported
+ # by its arcane TTY system and only results in cryptic error messages
+ # ending on the standard output
+ # (we do the s390 detection here directly to avoid
+ # the delay caused by importing the Blivet module
+ # just for this single call)
+ is_s390 = os.uname()[4].startswith('s390')
+ if not is_s390:
+ help_width = get_help_width()
self._boot_arg = dict()
self.deprecated_bootargs = []
self.bootarg_prefix = kwargs.pop("bootarg_prefix", "")
--
1.9.3
9 years, 8 months
[lorax] Remove at-spi
by David Shea
at-spi is the old accessibility library, deprecated in these gtk3 times
by at-spi2-atk. at-spi-corba has been replaced with atk-bridge.
at-spi2-atk is a dependency of gtk3, so there's no need to explicitly
add it.
---
share/runtime-cleanup.tmpl | 2 --
share/runtime-install.tmpl | 1 -
share/runtime-postinstall.tmpl | 1 -
3 files changed, 4 deletions(-)
diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 452bebe..d144a51 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -126,8 +126,6 @@ removefrom NetworkManager /usr/share/locale/*/NetworkManager.mo
removefrom nm-connection-editor /usr/${libdir}/*
removefrom nm-connection-editor /usr/share/applications/*
removefrom anaconda /etc/* /usr/share/applications/* /usr/share/icons/*
-removefrom at-spi /etc/xdg/* /usr/${libdir}/libcspi*
-removefrom at-spi /usr/${libdir}/libloginhelper* /usr/share/locale/*
removefrom atk /usr/share/locale/*
removefrom audit /etc/* /sbin/audispd /sbin/auditctl /sbin/aureport
removefrom audit /sbin/ausearch /sbin/autrace /usr/bin/*
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 61b1d80..01c8ac6 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -78,7 +78,6 @@ installpkg xorg-x11-drivers xorg-x11-server-Xorg
installpkg xorg-x11-server-utils xorg-x11-xauth
installpkg dbus-x11 metacity gsettings-desktop-schemas
installpkg nm-connection-editor
-installpkg at-spi at-spi2-atk pyatspi
installpkg gnome-python2-gconf
installpkg gobject-introspection
installpkg librsvg2
diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl
index 17d8c14..45e55bf 100644
--- a/share/runtime-postinstall.tmpl
+++ b/share/runtime-postinstall.tmpl
@@ -83,7 +83,6 @@ replace "root:\*:" "root::" etc/shadow
## gconf settings
gconfset /desktop/gnome/interface/accessibility bool true
-gconfset /desktop/gnome/interface/at-spi-corba bool true
## Some settings are controlled by gsettings now.
install ${configdir}/org.gnome.desktop.wm.keybindings.gschema.override usr/share/glib-2.0/schemas
--
2.1.0
9 years, 8 months
[PATCH] Fix iSCSI reverse CHAP from kickstart (1037564)
by Martin Kolman
Turns out target and discover passwords are two different things[0]
and we should not mix them up or strange authentication errors show up.
Q: But why does it work in GUI ?
A: GUI does not call the addTarget() function and calls discover() directly
and supplies it with correct credentials.
[0] http://www.redhat.com/archives/anaconda-devel-list/2009-January/msg00289....
(this is BTW the only "documentation" for the libiscsi Python bindings I have been able to find...)
Martin Kolman (1):
Don't mix target and discovery credentials (#1037564)
blivet/iscsi.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--
1.9.3
9 years, 8 months
[PATCH blivet/master] devicelibs.lvm: fix pvmove(src, dest=DESTPATH)
by Will Woods
args.extend(str) will treat the str as iterable and append each
individual character to args; should be args.append(str).
---
blivet/devicelibs/lvm.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/blivet/devicelibs/lvm.py b/blivet/devicelibs/lvm.py
index 426794f..87d2639 100644
--- a/blivet/devicelibs/lvm.py
+++ b/blivet/devicelibs/lvm.py
@@ -261,7 +261,7 @@ def pvmove(source, dest=None):
"""
args = ["pvmove"] + _getConfigArgs() + [source]
if dest:
- args.extend(dest)
+ args.append(dest)
try:
lvm(args)
--
1.9.3
9 years, 8 months
[PATCH blivet rhel7-branch] iscsi: add iscsi singleton back
by Radek Vykydal
Perhaps accidentally removed by
commit ea4dcaa16cc26d65e9e8e94677d15
Breaks installation on iscsi using ibft.
---
blivet/iscsi.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/blivet/iscsi.py b/blivet/iscsi.py
index 5bfe48a..bef15bf 100644
--- a/blivet/iscsi.py
+++ b/blivet/iscsi.py
@@ -404,4 +404,7 @@ class iscsi(object):
return nodeDisks
+# Create iscsi singleton
+iscsi = iscsi()
+
# vim:tw=78:ts=4:et:sw=4
--
1.9.3
9 years, 8 months
[blivet PATCH rhel7-branch] iscsi: fix root argument being overriden by local variable (#1144463)
by Radek Vykydal
Resolves: rhbz#1144463
introduced by commit 5b39c90ae582a8fb008c3633954a33b583
---
blivet/iscsi.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/blivet/iscsi.py b/blivet/iscsi.py
index bef15bf..f3d423a 100644
--- a/blivet/iscsi.py
+++ b/blivet/iscsi.py
@@ -357,7 +357,7 @@ class iscsi(object):
self.stabilize()
- def write(self, root, storage):
+ def write(self, root_path, storage):
if not self.initiatorSet:
return
@@ -374,17 +374,17 @@ class iscsi(object):
if autostart:
node.setParameter("node.startup", "automatic")
- if not os.path.isdir(root + "/etc/iscsi"):
- os.makedirs(root + "/etc/iscsi", 0o755)
- fd = os.open(root + INITIATOR_FILE, os.O_RDWR | os.O_CREAT)
+ if not os.path.isdir(root_path + "/etc/iscsi"):
+ os.makedirs(root_path + "/etc/iscsi", 0o755)
+ fd = os.open(root_path + INITIATOR_FILE, os.O_RDWR | os.O_CREAT)
os.write(fd, "InitiatorName=%s\n" %(self.initiator))
os.close(fd)
# copy "db" files. *sigh*
- if os.path.isdir(root + "/var/lib/iscsi"):
- shutil.rmtree(root + "/var/lib/iscsi")
+ if os.path.isdir(root_path + "/var/lib/iscsi"):
+ shutil.rmtree(root_path + "/var/lib/iscsi")
if os.path.isdir("/var/lib/iscsi"):
- shutil.copytree("/var/lib/iscsi", root + "/var/lib/iscsi",
+ shutil.copytree("/var/lib/iscsi", root_path + "/var/lib/iscsi",
symlinks=True)
def getNode(self, name, address, port, iface):
--
1.9.3
9 years, 8 months
[PATCH rhel7-branch] The new Device(s) label has no mnemonic, so remove use_underline.
by Chris Lumens
This is because it no longer has a mnemonic widget.
Related: rhbz#1094856
---
pyanaconda/ui/gui/spokes/custom.glade | 1 -
1 file changed, 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade
index 600b333..6d8fea1 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -1764,7 +1764,6 @@ use. Try something else?</property>
<property name="valign">start</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Device(s):</property>
- <property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
--
1.9.3
9 years, 8 months
[master/rhel7-branch] Preserve network args on s390x. (#1087502)
by Samantha N. Bueno
These will now be copied to the target system's cmdline.
Resolves: rhbz#1087502
---
pyanaconda/bootloader.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 2fc1d49..9b3855c 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -2069,7 +2069,7 @@ class ZIPL(BootLoader):
return ["ext4", "ext3", "ext2", "xfs"]
image_label_attr = "short_label"
- preserve_args = ["cio_ignore"]
+ preserve_args = ["cio_ignore", "rd.znet", "rd_ZNET"]
def __init__(self):
super(ZIPL, self).__init__()
--
1.9.3
9 years, 8 months