New version.

3 files changed, 43 insertions, 22 deletions

diff --git a/anaconda.spec.in b/anaconda.spec.in
index 78223f971..eb1d9717f 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -249,6 +249,14 @@ update-desktop-database &> /dev/null || :
 /usr/lib/dracut/modules.d/80%{name}/*
 
 %changelog
+* Wed Apr 18 2012 Brian C. Lane <bcl@redhat.com> - 17.21-1
+- Fix a variable reference (#813923) (jkeating)
+- Complain about "serial" but don't assume ttyS0 (wwoods)
+- Remove double quotes in nvram (hamzy)
+- add a dialog while running convertfs (#812144) (bcl)
+- mount before resizing live image (#811706) (bcl)
+- check for valid mountpoints (#748209) (bcl)
+
 * Mon Apr 09 2012 Brian C. Lane <bcl@redhat.com> - 17.20-1
 - make dev_is_mounted more reliable (wwoods)
 - fix failure to run multiple udev-triggered jobs (#811008) (wwoods)
diff --git a/configure.ac b/configure.ac
index b1cb8105e..f66d678a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 m4_define(python_required_version, 2.5)
 
 AC_PREREQ([2.63])
-AC_INIT([anaconda], [17.20], [anaconda-devel-list@redhat.com])
+AC_INIT([anaconda], [17.21], [anaconda-devel-list@redhat.com])
 AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2])
 
 AC_CONFIG_HEADERS([config.h])
diff --git a/po/anaconda.pot b/po/anaconda.pot
index acb3f40b9..d62c7a53f 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: anaconda 17.19\n"
+"Project-Id-Version: anaconda 17.20\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2012-04-09 20:41-0700\n"
+"POT-Creation-Date: 2012-04-18 16:46-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,62 +116,67 @@ msgstr ""
 msgid "%s must have one of the following disklabel types: %s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:521 pyanaconda/bootloader.py:659
+#: pyanaconda/bootloader.py:521 pyanaconda/bootloader.py:665
 #, python-format
 msgid "%s cannot be of type %s."
 msgstr ""
 
-#: pyanaconda/bootloader.py:533
+#: pyanaconda/bootloader.py:527
+#, python-format
+msgid "%s must be mounted on one of %s."
+msgstr ""
+
+#: pyanaconda/bootloader.py:539
 #, python-format
 msgid "%s must be between %d and %d MB in size"
 msgstr ""
 
-#: pyanaconda/bootloader.py:538
+#: pyanaconda/bootloader.py:544
 #, python-format
 msgid "%s must not be smaller than %dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:547
+#: pyanaconda/bootloader.py:553
 #, python-format
 msgid "%s must not be larger than %dMB."
 msgstr ""
 
-#: pyanaconda/bootloader.py:565
+#: pyanaconda/bootloader.py:571
 #, python-format
 msgid "%s must be within the first %dMB of the disk."
 msgstr ""
 
-#: pyanaconda/bootloader.py:575
+#: pyanaconda/bootloader.py:581
 #, python-format
 msgid "%s must be on a primary partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:699 pyanaconda/bootloader.py:804
+#: pyanaconda/bootloader.py:705 pyanaconda/bootloader.py:810
 #, python-format
 msgid "%s cannot be on an encrypted block device."
 msgstr ""
 
-#: pyanaconda/bootloader.py:762
+#: pyanaconda/bootloader.py:768
 #, python-format
 msgid "%s cannot be of type %s"
 msgstr ""
 
-#: pyanaconda/bootloader.py:1626
+#: pyanaconda/bootloader.py:1632
 msgid ""
 "Your BIOS-based system needs a special partition to boot with Fedora's new "
 "disk label format (GPT). To continue, please create a 1MB 'BIOS Boot' type "
 "partition."
 msgstr ""
 
-#: pyanaconda/bootloader.py:2282
+#: pyanaconda/bootloader.py:2288
 msgid "Bootloader"
 msgstr ""
 
-#: pyanaconda/bootloader.py:2283
+#: pyanaconda/bootloader.py:2289
 msgid "Installing bootloader."
 msgstr ""
 
-#: pyanaconda/bootloader.py:2290 pyanaconda/bootloader.py:2349
+#: pyanaconda/bootloader.py:2296 pyanaconda/bootloader.py:2355
 #: pyanaconda/gui.py:1093 pyanaconda/image.py:87
 #: pyanaconda/installinterfacebase.py:74
 #: pyanaconda/installinterfacebase.py:151 pyanaconda/packages.py:90
@@ -180,13 +185,13 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: pyanaconda/bootloader.py:2291
+#: pyanaconda/bootloader.py:2297
 msgid ""
 "No kernel packages were installed on the system. Bootloader configuration "
 "will not be changed."
 msgstr ""
 
-#: pyanaconda/bootloader.py:2350
+#: pyanaconda/bootloader.py:2356
 msgid ""
 "There was an error installing the bootloader.  The system may not be "
 "bootable."
@@ -1455,14 +1460,22 @@ msgstr ""
 msgid "Invalid Directories"
 msgstr ""
 
-#: pyanaconda/upgrade.py:282
-msgid "/usr upgrade failed"
+#: pyanaconda/upgrade.py:278
+msgid "Upgrade /usr symlinks"
+msgstr ""
+
+#: pyanaconda/upgrade.py:279
+msgid "Running /usr merge script"
+msgstr ""
+
+#: pyanaconda/upgrade.py:288
+msgid "/usr merge failed"
 msgstr ""
 
-#: pyanaconda/upgrade.py:283
+#: pyanaconda/upgrade.py:289
 msgid ""
-"convertfs failed to upgrade your system to symlink into /usr. This is "
-"required for Fedora 17 to work. The upgrade cannot continue.\n"
+"The /usr merge script failed. This is required for Fedora 17 to work. The "
+"upgrade cannot continue.\n"
 "\n"
 msgstr ""