--- anaconda | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/anaconda b/anaconda index 0f08db3..3198af7 100755 --- a/anaconda +++ b/anaconda @@ -352,6 +352,9 @@ def check_memory(anaconda, opts, display_mode=None): "terminal.") nolivecd_extra = _(" Starting text mode.")
+ if opts.rescue: + return + if not display_mode: display_mode = anaconda.displayMode
--- pyanaconda/bootloader.py | 1 + 1 file changed, 1 insertion(+)
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index 9238e88..20f7b3b 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1358,6 +1358,7 @@ class GRUB2(GRUB): "btrfs subvolume"] stage2_raid_levels = [mdraid.RAID0, mdraid.RAID1, mdraid.RAID4, mdraid.RAID5, mdraid.RAID6, mdraid.RAID10] + stage2_raid_metadata = ["0", "0.90", "1.0", "1.2"]
@property def stage2_format_types(self):
--- pyanaconda/ui/gui/hubs/progress.glade | 8 ++++---- pyanaconda/ui/gui/hubs/progress.py | 1 + pyanaconda/ui/gui/spokes/custom.glade | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pyanaconda/ui/gui/hubs/progress.glade b/pyanaconda/ui/gui/hubs/progress.glade index 11e29f5..bab2711 100644 --- a/pyanaconda/ui/gui/hubs/progress.glade +++ b/pyanaconda/ui/gui/hubs/progress.glade @@ -125,8 +125,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">%s is now successfully installed on your system, but some configuration still needs to be done. -Finish it and then click the Finish configuration button please.</property> + <property name="label" translatable="yes">%s is now successfully installed on your system, but some configuration still needs to be done. Finish it and then click the Finish configuration button please.</property> + <property name="wrap">True</property> </object> <packing> <property name="left_attach">1</property> @@ -178,8 +178,8 @@ Finish it and then click the Finish configuration button please.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">%s is now successfully installed on your system and ready -for you to use! Go ahead and reboot to start using it!</property> + <property name="label" translatable="yes">%s is now successfully installed on your system and ready for you to use! Go ahead and reboot to start using it!</property> + <property name="wrap">True</property> </object> <packing> <property name="left_attach">1</property> diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py index 3b1147d..65cd9e4 100644 --- a/pyanaconda/ui/gui/hubs/progress.py +++ b/pyanaconda/ui/gui/hubs/progress.py @@ -178,6 +178,7 @@ class ProgressHub(Hub): continueText = self.builder.get_object("rebootLabel") continueText.set_text(_("%s is now successfully installed on your system and ready " "for you to use! When you are ready, reboot your system to start using it!")) + continueText.set_line_wrap(True) self.continueButton.set_label("_Quit")
self._progressBar = self.builder.get_object("progressBar") diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index 72d06ca..39c0906 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -479,8 +479,8 @@ use. Try something else?</property> <object class="GtkLabel" id="whenCreateLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">When you create mount points for your %s %s install, -you'll be able to view their details here.</property> + <property name="label" translatable="yes">When you create mount points for your %s %s install, you'll be able to view their details here.</property> + <property name="wrap">True</property> </object> </child> <child type="tab">
Ack.
----- Original Message -----
pyanaconda/ui/gui/hubs/progress.glade | 8 ++++---- pyanaconda/ui/gui/hubs/progress.py | 1 + pyanaconda/ui/gui/spokes/custom.glade | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pyanaconda/ui/gui/hubs/progress.glade b/pyanaconda/ui/gui/hubs/progress.glade index 11e29f5..bab2711 100644 --- a/pyanaconda/ui/gui/hubs/progress.glade +++ b/pyanaconda/ui/gui/hubs/progress.glade @@ -125,8 +125,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property>
<property name="label"translatable="yes">%s is now successfully installed on your system, but some configuration still needs to be done. -Finish it and then click the Finish configuration button please.</property>
<property name="label"translatable="yes">%s is now successfully installed on your system, but some configuration still needs to be done. Finish it and then click the Finish configuration button please.</property>
<propertyname="wrap">True</property> </object> <packing> <property name="left_attach">1</property> @@ -178,8 +178,8 @@ Finish it and then click the Finish configuration button please.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property>
<property name="label"translatable="yes">%s is now successfully installed on your system and ready -for you to use! Go ahead and reboot to start using it!</property>
<property name="label"translatable="yes">%s is now successfully installed on your system and ready for you to use! Go ahead and reboot to start using it!</property>
<propertyname="wrap">True</property> </object> <packing> <property name="left_attach">1</property> diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py index 3b1147d..65cd9e4 100644 --- a/pyanaconda/ui/gui/hubs/progress.py +++ b/pyanaconda/ui/gui/hubs/progress.py @@ -178,6 +178,7 @@ class ProgressHub(Hub): continueText = self.builder.get_object("rebootLabel") continueText.set_text(_("%s is now successfully installed on your system and ready " "for you to use! When you are ready, reboot your system to start using it!"))
continueText.set_line_wrap(True) self.continueButton.set_label("_Quit") self._progressBar = self.builder.get_object("progressBar")diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index 72d06ca..39c0906 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -479,8 +479,8 @@ use. Try something else?</property> <object class="GtkLabel" id="whenCreateLabel"> <property name="visible">True</property> <property name="can_focus">False</property>
<property name="label"translatable="yes">When you create mount points for your %s %s install, -you'll be able to view their details here.</property>
<property name="label"translatable="yes">When you create mount points for your %s %s install, you'll be able to view their details here.</property>
<property name="wrap">True</property> </object> </child> <child type="tab">-- 1.7.11.2
anaconda-patches mailing list anaconda-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
Ack to these threes.
anaconda-patches@lists.fedorahosted.org
-
Brian C. Lane -
Chris Lumens -
Martin Sivak