[master][PATCH] Change the message of text mode warning. (#966771)
by Samantha N. Bueno
As noted in the bug description, text mode has changed, so the
message on boot warning of its limitations should be changed
accordingly.
---
anaconda | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/anaconda b/anaconda
index 9eb3162..7a3ab8e 100755
--- a/anaconda
+++ b/anaconda
@@ -512,9 +512,9 @@ def setupDisplay(anaconda, opts, addon_paths=None):
if anaconda.displayMode == 't' and flags.vncquestion:
#we prefer vnc over text mode, so ask about that
message = _("Text mode provides a limited set of installation "
- "options. It does not allow you to specify your "
- "own partitioning layout or package selections. "
- "Would you like to use VNC mode instead?")
+ "options. It does not offer custom partitioning for "
+ "full control over the disk layout. Would you like "
+ "to use VNC mode instead?")
app = App("VNC Question")
spoke = AskVNCSpoke(app, anaconda.ksdata, message=message)
--
1.7.11.7
10 years, 11 months
[PATCH] After handling a transaction error, quit instead of doing a traceback.
by Chris Lumens
---
pyanaconda/packaging/yumpayload.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 6cd223d..4bb6793 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -1584,7 +1584,8 @@ reposdir=%s
log.error("Error running anaconda-yum: %s" % e)
exn = PayloadInstallError(str(e))
if errorHandler.cb(exn) == ERROR_RAISE:
- raise exn
+ progressQ.send_quit(1)
+ sys.exit(1)
finally:
# log the contents of the scriptlet logfile if any
if os.path.exists(script_log):
@@ -1598,7 +1599,8 @@ reposdir=%s
if install_errors:
exn = PayloadInstallError("\n".join(install_errors))
if errorHandler.cb(exn) == ERROR_RAISE:
- raise exn
+ progressQ.send_quit(1)
+ sys.exit(1)
def writeMultiLibConfig(self):
if not self.data.packages.multiLib:
--
1.8.1.2
10 years, 11 months
[PATCH] Print transaction errors in anaconda-yum so they are displayed in the UI.
by Chris Lumens
---
scripts/anaconda-yum | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts/anaconda-yum b/scripts/anaconda-yum
index f3b2aea..da40fcc 100755
--- a/scripts/anaconda-yum
+++ b/scripts/anaconda-yum
@@ -141,6 +141,8 @@ def run_yum_transaction(release, arch, yum_conf, install_root, ts_file, script_l
print("ERROR: PackageSackError: %s" % e)
except YumRPMTransError as e:
print("ERROR: YumRPMTransError: %s" % e)
+ for error in e.errors:
+ print("ERROR: %s" % error[0])
except YumBaseError as e:
print("ERROR: YumBaseError: %s" % e)
for error in e.errors:
--
1.8.1.2
10 years, 11 months
[master/f19-branch][PATCH] Add some more details to disk list in storage spoke. (#965592)
by Samantha N. Bueno
Personally I think it would be nice to see this in f19-branch but not
entirely necessary; it is not a very big/invasive change though.
====
Instead of sda, sdb, etc. emulate the GUI and use friendly names
to list disks and size.
Preview of how disks appear in storage spoke with this change (ignoring
how old this boot.iso is, eesh):
http://sbueno.fedorapeople.org/images/965592.png
---
pyanaconda/ui/tui/spokes/storage.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py
index 68c6663..4dfd68c 100644
--- a/pyanaconda/ui/tui/spokes/storage.py
+++ b/pyanaconda/ui/tui/spokes/storage.py
@@ -22,7 +22,7 @@
# which has the same license and authored by David Lehman <dlehman(a)redhat.com>
#
-from pyanaconda.ui.lib.disks import getDisks
+from pyanaconda.ui.lib.disks import getDisks, size_str
from pyanaconda.ui.tui.spokes import NormalTUISpoke
from pyanaconda.ui.tui.simpleline import TextWidget, CheckboxWidget
@@ -181,8 +181,9 @@ class StorageSpoke(NormalTUISpoke):
# loop through the disks and present them.
for disk in self.disks:
- c = CheckboxWidget(title="%i) %s" % (self.disks.index(disk) + 1,
- disk.name),
+ size = size_str(disk.size)
+ c = CheckboxWidget(title="%i) %s: %s (%s)" % (self.disks.index(disk) + 1,
+ disk.model, size, disk.name),
completed=(disk.name in self.selected_disks))
self._window += [c, ""]
--
1.7.11.7
10 years, 11 months
[PATCH yum/anaconda] allow environment options to default to enabled
by Bill Nottingham
(Apologies for the cross-post, but the patches go together.)
There have been multiple requests that environments in anaconda be able
to be 'default-selected'. The general use cases are:
- to select the office suite by default when installing desktops, while
allowing users to deselect it
- to split some applications out of the desktop groups so users can choose
to have a more minimal desktop installation, while remaining selected for
the simple choice
These two patches implement it; first by allowing 'default=true' to be
set for the group and parsed by the yum comps module, and then by changing
anaconda to honor it.
Bill
10 years, 11 months
[rhel5-branch] Skip relabeling empty disks on s390 (#966950)
by Brian C. Lane
From: "Brian C. Lane" <bcl(a)redhat.com>
s390 reports that its default disklabel should be msdos when it actually
uses dasd, and s390 doesn't use GPT, so just skip trying to relabel
empty disks on s390
It also ends up that the dev = parted.PedDevice.get(deviceFile) call
needs to be after the format on s390.
Related: rhbz#758881
---
autopart.py | 4 +++-
partedUtils.py | 5 +++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/autopart.py b/autopart.py
index ff46eb1..6a24762 100644
--- a/autopart.py
+++ b/autopart.py
@@ -1205,7 +1205,9 @@ def doClearPartAction(anaconda, partitions, diskset):
partitions.addDelete(delete)
deletePart(diskset, delete)
- if linuxOnly == 0 and disk.get_primary_partition_count() == 0:
+ # s390 reports msdos as default, but doesn't use it or gpt, so skip this
+ if rhpl.getArch() != "s390" and \
+ linuxOnly == 0 and disk.get_primary_partition_count() == 0:
# The disk is empty and we are clearing all partitions, so relabel it
dev = disk.dev
label = needGPTLabel(dev, getDefaultDiskType())
diff --git a/partedUtils.py b/partedUtils.py
index a6dac86..4fa319b 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -1095,7 +1095,8 @@ class DiskSet:
"-F",
"-f",
"/tmp/%s" % drive]
-
+ log.debug(" ".join(argList))
+
fd = os.open("/dev/null", os.O_RDWR | os.O_CREAT | os.O_APPEND)
p = os.pipe()
childpid = os.fork()
@@ -1207,7 +1208,6 @@ class DiskSet:
log.info("Reinitializing label for drive %s" % (drive,))
deviceFile = isys.makeDevInode(drive, "/dev/" + drive)
- dev = parted.PedDevice.get(deviceFile)
try:
try:
@@ -1217,6 +1217,7 @@ class DiskSet:
if self.dasdFmt(drive):
raise LabelError, drive
+ dev = parted.PedDevice.get(deviceFile)
disk = parted.PedDisk.new(dev)
else:
disk = labelDisk(deviceFile)
--
1.8.1.4
10 years, 11 months
[rhel5-branch] Fix for broken LVM volume reuse (BZ 751351)
by Martin Kolman
After an eventful RHEL5-running-on-exotic-enterprise-hardware adventure,
I've managed to find the root cause of the bug and fix it.
Anaconda in RHEL5 can yet again reuse LVM volumes on HP CCISS hardware.
And of course the fix is a one-liner.
Martin Kolman (1):
Fix LVM reuse failing on HP CCISS Hardware (#751351)
lvm.py | 9 +++++++++
1 file changed, 9 insertions(+)
--
1.8.1.4
10 years, 11 months
[PATCH] fix that grey icon thing
by Chris Lumens
This appears to work. The first patch is for f19-branch, the second is not
strictly for the branch but won't hurt anything. Let me know.
- Chris
10 years, 11 months