[master] More changes to support Spoke sharing with FB
by Martin Sivak
Patches in this set configure anaconda to actually look for
addon UI elements and use them properly.
Some of them also enhance the API for anaconda-firstboot
interaction. One last piece is missing there, the actual code to
save to disk what was configured during installation.
11 years, 3 months
[f18-branch/master] hook up help window close button
by Brian C. Lane
From: "Brian C. Lane" <bcl(a)redhat.com>
---
pyanaconda/ui/gui/spokes/custom.glade | 1 +
1 file changed, 1 insertion(+)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade
index 6abee1b..59eb541 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -28,6 +28,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
+ <signal name="clicked" handler="on_close" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
--
1.8.0.2
11 years, 4 months
[f18-branch] add setKeyboardCheckButton to list of things to translate (#889352)
by Brian C. Lane
From: "Brian C. Lane" <bcl(a)redhat.com>
---
pyanaconda/ui/gui/spokes/welcome.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py
index 95fc1fa..f335c14 100644
--- a/pyanaconda/ui/gui/spokes/welcome.py
+++ b/pyanaconda/ui/gui/spokes/welcome.py
@@ -166,7 +166,7 @@ class LanguageMixIn(object):
# Change the translations on labels and buttons that do not have
# substitution text.
for name in ["pickLanguageLabel", "betaWarnTitle", "betaWarnDesc",
- "quitButton", "continueButton"]:
+ "quitButton", "continueButton", "setKeyboardCheckButton"]:
self._retranslate_one(name)
# The welcome label is special - it has text that needs to be
--
1.8.0.2
11 years, 4 months
[f18-branch/master] Fix for some storage-related translation issues
by Vratislav Podzimek
As jreznik wrote:
"Storage is tricky part and without proper translations it could be minefield for
users..."
Please git am these patches for the next (last?) F18 build. Thanks!
Vratislav Podzimek (2):
Mark storage errors for translations and show them translated
(#877658)
Mark for translation and show translated some more GUI elements
(#877658)
pyanaconda/storage/partitioning.py | 45 +++++++++++++++++----------------
pyanaconda/ui/gui/spokes/custom.glade | 4 +--
pyanaconda/ui/gui/spokes/custom.py | 2 +-
pyanaconda/ui/gui/spokes/lib/cart.glade | 4 +--
4 files changed, 28 insertions(+), 27 deletions(-)
--
1.7.11.7
11 years, 4 months
[f18-branch] Remove a couple things that aren't working
by Brian C. Lane
From: "Brian C. Lane" <bcl(a)redhat.com>
Shrink doesn't give the user any control on the amount to shrink by. Remove the
shrink button.
The checkbox to use or not use the update repo isn't connected to anything. At
this point it is best to just remove it.
Brian C. Lane (2):
Remove Shrink button from reclaim dialog (#875944)
remove the don't use upgrades checkbox from source (#889366)
pyanaconda/ui/gui/spokes/lib/resize.glade | 12 -----------
pyanaconda/ui/gui/spokes/lib/resize.py | 22 +++++++++----------
pyanaconda/ui/gui/spokes/source.glade | 35 -------------------------------
3 files changed, 11 insertions(+), 58 deletions(-)
--
1.8.0.2
11 years, 4 months
[f18-branch/master] Use systemd to run checkisomd5 (#874486)
by Brian C. Lane
From: Harald Hoyer <harald(a)redhat.com>
NOTE: working on testing this (bcl)
---
anaconda.spec.in | 3 ++-
dracut/anaconda-diskroot | 7 ++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/anaconda.spec.in b/anaconda.spec.in
index e457736..3931f05 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -47,6 +47,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%define pythonurlgrabberver 3.9.1-5
%define utillinuxver 2.15.1
%define syslinuxver 3.73
+%define dracutver 024-16
BuildRequires: audit-libs-devel
BuildRequires: bzip2-devel
@@ -205,7 +206,7 @@ documentation for working with this library.
%package dracut
Summary: The anaconda dracut module
BuildArch: noarch
-Requires: dracut >= 19
+Requires: dracut >= %{dracutver}
Requires: dracut-network
Requires: xz
Requires: pykickstart
diff --git a/dracut/anaconda-diskroot b/dracut/anaconda-diskroot
index 051081b..21c8afe 100755
--- a/dracut/anaconda-diskroot
+++ b/dracut/anaconda-diskroot
@@ -12,7 +12,12 @@ run_checkisomd5() {
[ -b $livedev ] && fs=$(blkid -s TYPE -o value $livedev)
if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then
[ -x /bin/plymouth ] && /bin/plymouth --hide-splash
- checkisomd5 --verbose $livedev
+ if [ -n "$DRACUT_SYSTEMD" ]; then
+ p=$(str_replace "$livedev" "-" '\x2d')
+ systemctl start checkisomd5(a)${p}.service
+ else
+ checkisomd5 --verbose $livedev
+ fi
if [ $? -ne 0 ]; then
die "CD check failed!"
exit 1
--
1.8.0.2
11 years, 4 months
[f18-branch/master 1/2] fixup nfs repo install code (#879187)
by Brian C. Lane
From: "Brian C. Lane" <bcl(a)redhat.com>
Searching for an empty string inside of another string always returns
True. It wasn't properly detecting whether dracut had setup the nfs
repo.
---
pyanaconda/packaging/yumpayload.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index e65ed5d..1555bf0 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -601,7 +601,7 @@ reposdir=%s
options, host, path = iutil.parseNfsUrl('nfs:%s' % isodev)
# See if the dir holding the iso is what we want
# and also if we have an iso mounted to /run/install/repo
- if path in isodev and DRACUT_ISODIR in device:
+ if path and path in isodev and DRACUT_ISODIR in device:
# Everything should be setup
url = "file://" + DRACUT_REPODIR
else:
@@ -609,7 +609,7 @@ reposdir=%s
needmount = True
if device:
options, host, path = iutil.parseNfsUrl('nfs:%s' % device)
- if path in device:
+ if path and path in device:
needmount = False
path = DRACUT_REPODIR
if needmount:
--
1.8.0.2
11 years, 4 months
[lorax] Do not remove gtk3 share files
by Martin Gracik
Resolves: rhbz#875846
---
share/runtime-cleanup.tmpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 5ac30a8..34a0a3a 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -214,7 +214,7 @@ removefrom grep /etc/* /usr/share/locale/*
removefrom gstreamer /usr/bin/* /usr/${libdir}/gstreamer-0.10/*
removefrom gstreamer /usr/${libdir}/libgst* /usr/libexec/* /usr/share/locale/*
removefrom gtk2 /usr/bin/update-gtk-immodules
-removefrom gtk3 /usr/share/* /usr/${libdir}/gtk-3.0/*
+removefrom gtk3 /usr/${libdir}/gtk-3.0/*
removefrom gtk3 /usr/${libdir}/libgailutil*
removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew}
removefrom hwdata /etc/* /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids
--
1.7.9.5
11 years, 4 months
[lorax] Fix rexists
by Martin Gracik
---
src/pylorax/ltmpl.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/pylorax/ltmpl.py b/src/pylorax/ltmpl.py
index 040f1aa..d716586 100644
--- a/src/pylorax/ltmpl.py
+++ b/src/pylorax/ltmpl.py
@@ -95,7 +95,11 @@ def rglob(pathname, root="/", fatal=False):
raise IOError, "nothing matching %s in %s" % (pathname, root)
def rexists(pathname, root=""):
- return True if rglob(pathname, root) else False
+ # Generator is always True, even with no values;
+ # bool(rglob(...)) won't work here.
+ for _path in rglob(pathname, root):
+ return True
+ return False
# TODO: operate inside an actual chroot for safety? Not that RPM bothers..
class LoraxTemplateRunner(object):
--
1.7.9.5
11 years, 4 months