[rhel5-branch] [PATCH] Don't remove files from the kmod-gfs package (#754213)
by Vratislav Podzimek
Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com>
---
scripts/upd-instroot | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index b18675d..4ed9e0c 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -596,6 +596,7 @@ $LIBDIR/libresolv.so*
$LIBDIR/libresolv-*.so*
$LIBDIR/libvtoc*.so*
lib/modules/ibm/*
+$LIBDIR/modules/*/extra/gfs/*
etc/xinetd.conf
etc/pam.d/sshd
etc/pam.d/other
--
1.7.11.7
11 years, 7 months
[PATCH rhel5-branch] Include syslinux-perl from split syslinux package (#872225)
by Radek Vykydal
Needed for ppmtolss16 command.
Resolves: rhbz#872225
---
scripts/upd-instroot | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index b18675d..23b83aa 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -225,7 +225,7 @@ if [ $ARCH = sparc ]; then
fi
if [ $ARCH = i386 -o $ARCH = x86_64 ]; then
- PACKAGESGR="$PACKAGESGR syslinux memtest86+"
+ PACKAGESGR="$PACKAGESGR syslinux syslinux-perl memtest86+"
fi
if [ $ARCH = alpha ]; then
--
1.7.4
11 years, 7 months
[PATCH master and f18-beta-branch (take 2)] Make language groups work again (#873865)
by Jesse Keating
We have to potentially unmangle a lang value from say es_ES.UTF-8 down
to just "es" in order to find the group within comps.
---
pyanaconda/packaging/yumpayload.py | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 97f0c8e..0c53dde0 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -80,6 +80,9 @@ from pyanaconda.errors import *
from pyanaconda.packaging import NoSuchGroup, NoSuchPackage
import pyanaconda.progress as progress
+from pyanaconda.localization import expand_langs
+import itertools
+
from pykickstart.constants import KS_MISSING_IGNORE
default_repos = [productName.lower(), "rawhide"]
@@ -918,9 +921,15 @@ reposdir=%s
if yum_groups:
with _yum_lock:
- groups = [g.groupid for g in yum_groups.get_groups() if g.langonly == lang]
-
- return groups
+ langs = expand_langs(lang)
+ groups = map(lambda x: [g.groupid for g in
+ yum_groups.get_groups() if g.langonly == x],
+ langs)
+
+ # the map gives us a list of results, this set call reduces
+ # it down to a unique set, then list() makes it back into a list.
+ # what the * does is a mystery!
+ return list(set(itertools.chain(*groups)))
def groupDescription(self, groupid):
""" Return name/description tuple for the group specified by id. """
--
1.7.11.4
11 years, 7 months
f18-beta-branch re-fix
by David Lehman
In the first patch I fixed the regular expression but neglected to
adjust the index of the path match group accordingly. In this
version I just drop the groups that we don't care about to simplify
maintenance in case this command's output changes again in the future.
11 years, 7 months
[PATCH 1/5] If repo metadata fetching fails, set an info error message (#873605).
by Chris Lumens
The error message isn't the best one ever, and unfortunately the real error
is buried so deep that there's not really much hope of getting it to
display. At least this way, the user might think to look at the log file.
---
pyanaconda/ui/gui/spokes/source.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index f1271bb..59e27f9 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -545,6 +545,7 @@ class SourceSpoke(NormalSpoke):
_(METADATA_ERROR_MESSAGE))
communication.send_ready(self.__class__.__name__)
self._error = True
+ self.window.set_info(Gtk.MessageType.WARNING, _("Failed to set up install source, check the repo url"))
else:
communication.send_ready(self.__class__.__name__)
communication.send_ready("SoftwareSelectionSpoke")
--
1.7.11.2
11 years, 7 months
[PATCH master and f18-beta-branch] Make language groups work again (#873865)
by Jesse Keating
We have to potentially unmangle a lang value from say es_ES.UTF-8 down
to just "es" in order to find the group within comps.
---
pyanaconda/packaging/yumpayload.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 97f0c8e..831ce28 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -918,7 +918,13 @@ reposdir=%s
if yum_groups:
with _yum_lock:
- groups = [g.groupid for g in yum_groups.get_groups() if g.langonly == lang]
+ groups = [g.groupid for g in yum_groups.get_groups() if
+ g.langonly == lang]
+ # Try to use an unmangled lang value
+ if not groups:
+ shortlang = lang.split('_')[0]
+ groups = [g.groupid for g in yum_groups.get_groups() if
+ g.langonly == shortlang]
return groups
--
1.7.11.4
11 years, 7 months
[PATCH master and f18-beta-branch] Enable yum langpacks plugin to get conditional packages (#868869)
by Jesse Keating
This will require lorax to actually put the plugin files in the image,
but once they are there we get all the benefit of somebody else's code
managing conditional package installs.
---
pyanaconda/packaging/yumpayload.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 50f281d..97f0c8e 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -189,7 +189,11 @@ class YumPayload(PackagePayload):
# Set some configuration parameters that don't get set through a config
# file. yum will know what to do with these.
- self._yum.preconf.enabled_plugins = ["blacklist", "whiteout", "fastestmirror"]
+ # Enable all types of yum plugins. We're somewhat careful about what
+ # plugins we put in the environment.
+ self._yum.preconf.plugin_types = yum.plugins.ALL_TYPES
+ self._yum.preconf.enabled_plugins = ["blacklist", "whiteout", "fastestmirror",
+ "langpacks"]
self._yum.preconf.fn = "/tmp/anaconda-yum.conf"
self._yum.preconf.root = root
# set this now to the best default we've got ; we'll update it if/when
--
1.7.11.4
11 years, 7 months
f18 patches
by David Lehman
All except for patch 5 are for f18-beta-branch as well as master.
11 years, 7 months
[LORAX PATCH] Install the yum-langpacks plugin (#868869)
by Jesse Keating
---
share/runtime-install.tmpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index e6203f3..72fc34a 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -124,7 +124,7 @@ installpkg icfg spice-vdagent
installpkg gdisk
## yum plugins
-installpkg yum-plugin-fastestmirror
+installpkg yum-plugin-fastestmirror yum-langpacks
## actually install all the requested packages
run_pkg_transaction
--
1.7.11.4
11 years, 7 months
[PATCH] Update payload if slower dhcp succeeds in network pre-hub spoke (#873468)
by Radek Vykydal
Do not check initially_connected in refresh() but in __init__()
---
pyanaconda/ui/gui/spokes/network.py | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
index 1d007e7..2ae4184 100644
--- a/pyanaconda/ui/gui/spokes/network.py
+++ b/pyanaconda/ui/gui/spokes/network.py
@@ -1023,7 +1023,7 @@ class NetworkStandaloneSpoke(StandaloneSpoke):
parent = self.builder.get_object("AnacondaStandaloneWindow-action_area5")
parent.add(self.network_control_box.vbox)
- self._initially_available = False
+ self._initially_available = self.completed
self._now_available = False
def apply(self):
@@ -1060,8 +1060,6 @@ class NetworkStandaloneSpoke(StandaloneSpoke):
StandaloneSpoke.refresh(self)
self.network_control_box.refresh()
- self._initially_available = self.completed
-
def on_back_clicked(self, window):
self.window.hide()
Gtk.main_quit()
--
1.7.4
11 years, 7 months