[master] [PATCH] Do not allow TreeView search in AddLayout dialog (#876131)
by Vratislav Podzimek
There is an entry for filtering, searching doesn't work (it probably
uses the underlaying non-sorted model) as it not needed.
Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com>
---
pyanaconda/ui/gui/spokes/keyboard.glade | 1 +
1 file changed, 1 insertion(+)
diff --git a/pyanaconda/ui/gui/spokes/keyboard.glade b/pyanaconda/ui/gui/spokes/keyboard.glade
index 1a67d24..b859c52 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.glade
+++ b/pyanaconda/ui/gui/spokes/keyboard.glade
@@ -108,6 +108,7 @@
<property name="model">newLayoutStoreSort</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
+ <property name="enable_search">False</property>
<signal name="button-press-event" handler="on_layout_view_button_press" swapped="no"/>
<child internal-child="selection">
<object class="GtkTreeSelection" id="newLayoutSelection">
--
1.7.11.7
11 years, 6 months
[rhel5-branch] [PATCH] Add extra modules that are not in the kernel package
by Vratislav Podzimek
Some modules that we want are not in the kernel package. We need to
add them to the right directory tree before we make modules.cgz.
Resolves: rhbz#754213
Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com>
---
scripts/mk-images | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/scripts/mk-images b/scripts/mk-images
index ce3beb6..d468a64 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -53,6 +53,9 @@ INFINIBANDMODS="ib_ipoib"
MSHVMODS="hv_storvsc hv_mouse hv_netvsc hv_vmbus"
INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $BTERMMODS $COMMONMODS $PCMCIASOCKMODS $INFINIBANDMODS $MSHVMODS =scsi =net"
+# packages with modules not included in kernel
+EXTRAMODSPACKAGES="kmod-gfs"
+
# Set, verify, and create paths
KERNELPATH=$1
TOPDESTPATH=$2
@@ -866,6 +869,23 @@ for KERNELARCH in $arches; do
exit 1
fi
+ # add extra modules
+ for package in $EXTRAMODSPACKAGES; do
+ packagePath=(findPackage $KERNELPATH $package)
+ if [ "$KERNELARCH" = "i586" -a ! -f "$packagePath" ]; then
+ echo "No i586 $package, trying i686..."
+ KERNELARCH="i686"
+ packagePath=$(findPackage $KERNELPATH $package)
+ fi
+
+ if [ ! -f "$packagePath" ]; then
+ echo "$package doesn't exist for $KERNELARCH. skipping"
+ continue
+ fi
+
+ rpm2cpio $packagePath | (cd $KERNELROOT; cpio --quiet -iumd)
+ done
+
allmods=$(find $KERNELROOT/lib/modules/$version -name *.ko)
rundepmod "$allmods" $MODDEPS
--
1.7.11.7
11 years, 6 months
[PATCH 1/5] treebuilder: add 'prefix' to rebuild_initrds()
by Will Woods
If 'prefix' is passed to rebuild_initrds(), it will build a *new*
initramfs with a name like $PREFIX-$KERNELVER.img, rather than
overwriting the existing initramfs.
---
src/pylorax/treebuilder.py | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py
index 3ff0e6f..74a59ae 100644
--- a/src/pylorax/treebuilder.py
+++ b/src/pylorax/treebuilder.py
@@ -186,10 +186,13 @@ class TreeBuilder(object):
def kernels(self):
return findkernels(root=self.vars.inroot)
- def rebuild_initrds(self, add_args=[], backup=""):
+ def rebuild_initrds(self, add_args=[], backup="", prefix=""):
'''Rebuild all the initrds in the tree. If backup is specified, each
initrd will be renamed with backup as a suffix before rebuilding.
- If backup is empty, the existing initrd files will be overwritten.'''
+ If backup is empty, the existing initrd files will be overwritten.
+ If suffix is specified, the existing initrd is untouched and a new
+ image is built with the filename "${prefix}-${kernel.version}.img"
+ '''
dracut = ["dracut", "--nomdadmconf", "--nolvmconf"] + add_args
if not backup:
dracut.append("--force")
@@ -197,11 +200,16 @@ class TreeBuilder(object):
# Hush some dracut warnings. TODO: bind-mount proc in place?
open(joinpaths(self.vars.inroot,"/proc/modules"),"w")
for kernel in self.kernels:
- logger.info("rebuilding %s", kernel.initrd.path)
+ if prefix:
+ idir = os.path.dirname(kernel.initrd.path)
+ outfile = joinpaths(idir, prefix+'-'+kernel.version+'.img')
+ else:
+ outfile = kernel.initrd.path
+ logger.info("rebuilding %s", outfile)
if backup:
- initrd = joinpaths(self.vars.inroot, kernel.initrd.path)
+ initrd = joinpaths(self.vars.inroot, outfile)
os.rename(initrd, initrd + backup)
- cmd = dracut + [kernel.initrd.path, kernel.version]
+ cmd = dracut + [outfile, kernel.version]
runcmd(cmd, root=self.vars.inroot)
os.unlink(joinpaths(self.vars.inroot,"/proc/modules"))
--
1.8.0
11 years, 6 months
[PATCH 1/3] Don't decorate error dialogs.
by Chris Lumens
---
pyanaconda/ui/gui/__init__.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py
index 90e0e73..9e15abb 100644
--- a/pyanaconda/ui/gui/__init__.py
+++ b/pyanaconda/ui/gui/__init__.py
@@ -128,8 +128,9 @@ class GraphicalUserInterface(UserInterface):
message_type=Gtk.MessageType.ERROR,
buttons=Gtk.ButtonsType.NONE,
message_format=message)
+ dlg.set_decorated(False)
dlg.add_button(_("_Exit Installer"), 0)
-
+
with enlightbox(self._actions[0].window, dlg):
dlg.run()
dlg.destroy()
@@ -141,6 +142,7 @@ class GraphicalUserInterface(UserInterface):
message_type=Gtk.MessageType.QUESTION,
buttons=Gtk.ButtonsType.NONE,
message_format=message)
+ dlg.set_decorated(False)
dlg.add_buttons(_("_No"), 0, _("_Yes"), 1)
dlg.set_default_response(1)
--
1.7.11.2
11 years, 6 months
[PATCH] Disable the language spoke off the first hub, for now (#874263).
by Chris Lumens
I don't especially want to do this, but as stated elsewhere changing language
during installation is not at all easy. It's especially not easy from this
spoke, where everything's already been imported.
Eventually I think this spoke should allow for picking which languages you
want supported on the finished system (sort of a language-specific package
selection screen), but there's no time and this will at least prevent people
from hitting a really annoying bug.
---
pyanaconda/ui/gui/spokes/welcome.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py
index d99cd84..7362a18 100644
--- a/pyanaconda/ui/gui/spokes/welcome.py
+++ b/pyanaconda/ui/gui/spokes/welcome.py
@@ -303,3 +303,7 @@ class LanguageSpoke(LanguageMixIn, NormalSpoke):
(store, itr) = selected.get_selected()
return store[itr][0]
+
+ @property
+ def showable(self):
+ return False
--
1.7.11.2
11 years, 6 months
[PATCH] Wrap text on install options dialogs (#874265).
by Chris Lumens
---
pyanaconda/ui/gui/spokes/storage.glade | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade
index eb74a72..75c9b81 100644
--- a/pyanaconda/ui/gui/spokes/storage.glade
+++ b/pyanaconda/ui/gui/spokes/storage.glade
@@ -94,6 +94,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Here we'll describe what your options are.</property>
+ <property name="wrap">True</property>
<attributes>
<attribute name="font-desc" value="Cantarell 11"/>
</attributes>
@@ -307,6 +308,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Here we'll describe how much space is needed for the current software selection.</property>
+ <property name="wrap">True</property>
<attributes>
<attribute name="font-desc" value="Cantarell 11"/>
</attributes>
@@ -323,6 +325,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Here we'll describe what your options are.</property>
+ <property name="wrap">True</property>
<attributes>
<attribute name="font-desc" value="Cantarell 11"/>
</attributes>
@@ -366,6 +369,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Free space available for use.</property>
+ <property name="wrap">True</property>
<attributes>
<attribute name="font-desc" value="Cantarell 11"/>
</attributes>
@@ -401,6 +405,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Free space unavailable but reclaimable from existing partitions.</property>
+ <property name="wrap">True</property>
<attributes>
<attribute name="font-desc" value="Cantarell 11"/>
</attributes>
@@ -436,6 +441,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Space in selected disks reclaimable by deleting existing partitions.</property>
+ <property name="wrap">True</property>
<attributes>
<attribute name="font-desc" value="Cantarell 11"/>
</attributes>
@@ -658,6 +664,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Here we'll describe how much space is needed for the current software selection.</property>
+ <property name="wrap">True</property>
<attributes>
<attribute name="font-desc" value="Cantarell 11"/>
</attributes>
@@ -700,6 +707,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Free space available for use.</property>
+ <property name="wrap">True</property>
<attributes>
<attribute name="font-desc" value="Cantarell 11"/>
</attributes>
@@ -735,6 +743,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Free space unavailable but reclaimable from existing partitions.</property>
+ <property name="wrap">True</property>
<attributes>
<attribute name="font-desc" value="Cantarell 11"/>
</attributes>
@@ -770,6 +779,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Space in selected disks reclaimable by deleting existing partitions.</property>
+ <property name="wrap">True</property>
<attributes>
<attribute name="font-desc" value="Cantarell 11"/>
</attributes>
@@ -794,6 +804,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Here we'll describe what your options are.</property>
+ <property name="wrap">True</property>
<attributes>
<attribute name="font-desc" value="Cantarell 11"/>
</attributes>
--
1.7.11.2
11 years, 6 months
fix for one f18 beta blocker
by David Lehman
Fixes the error handling and prevents the error in the common
case (not entering any valid size when adding a new mountpoint).
11 years, 6 months
[PATCH] Show NFS as the source if dracut left it for us (#875235)
by Jesse Keating
---
pyanaconda/packaging/yumpayload.py | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index ac75683..d12a006 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -611,14 +611,25 @@ reposdir=%s
url = method.url
sslverify = not (method.noverifyssl or flags.noverifyssl)
elif method.method == "cdrom" or (checkmount and not method.method):
- # Did dracut leave the DVD mounted for us?
+ # Did dracut leave the DVD or NFS mounted for us?
device = get_mount_device("/run/install/repo")
# Only look at the dracut mount if we don't already have a cdrom
if device and not self.install_device:
self.install_device = storage.devicetree.getDeviceByPath(device)
url = "file:///run/install/repo"
if not method.method:
- method.method = "cdrom"
+ # See if this is a nfs mount
+ if ':' in device:
+ # prepend nfs: to the url as that's what the parser
+ # wants. Note we don't get options from this, but
+ # that's OK for the UI at least.
+ options, host, path = iutil.parseNfsUrl("nfs:%s" %
+ device)
+ method.method = "nfs"
+ method.server = host
+ method.dir = path
+ else:
+ method.method = "cdrom"
else:
# cdrom or no method specified -- check for media
if not self.install_device:
--
1.7.11.4
11 years, 6 months
[python-meh] One more unicode issue and tests resurrection
by Vratislav Podzimek
PATCH 3/4 tries to fix the issue with files containing non-ascii characters.
I've tried to reproduce the traceback from the bug, but had no luck. This should
work with valid ascii or utf-8 files and in case we get some malformed file, we
should really just skip it.
Other patches just reenable tests and add one that is basically a rewrite of my
testing script.
Vratislav Podzimek (4):
Fix tests
Add %check section to the spec file
Read files as UTF-8 and ignore errors (#874250)
Add test for handling unicode strings and files
meh/dump.py | 5 +++--
python-meh.spec | 9 ++++++++-
tests/attrSkipList.py | 8 +++-----
tests/baseclass.py | 4 ++--
tests/handle_unicode.py | 45 +++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 61 insertions(+), 10 deletions(-)
create mode 100644 tests/handle_unicode.py
--
1.7.11.7
11 years, 6 months
[PATCH master] Network spoke: fix traceback (number of callback parameters) (#875393)
by Radek Vykydal
---
pyanaconda/ui/gui/spokes/network.py | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
index db1e5f0..002679c 100644
--- a/pyanaconda/ui/gui/spokes/network.py
+++ b/pyanaconda/ui/gui/spokes/network.py
@@ -617,8 +617,10 @@ class NetworkControlBox():
ipv4cfg = device.get_ip4_config()
ipv6cfg = device.get_ip6_config()
if not ipv4cfg and not ipv6cfg:
- GLib.timeout_add(300, self._refresh_device_cfg, (device,
- num_of_tries-1))
+ GLib.timeout_add(300,
+ self._refresh_device_cfg,
+ (device, num_of_tries-1),
+ state)
return False
dev_type = device.get_device_type()
--
1.7.4
11 years, 6 months