New version.

3 files changed, 84 insertions, 73 deletions

diff --git a/anaconda.spec.in b/anaconda.spec.in
index 59bc039a4..b5925cbdf 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -215,6 +215,17 @@ update-desktop-database &> /dev/null || :
 %endif
 
 %changelog
+* Mon Oct 12 2009 David Cantrell <dcantrell@redhat.com> - 12.37-1
+- Missing volume_key shouldn't break LUKS support completely. (#526899)
+  (dlehman)
+- Write multipathd.conf in anaconda so that dracut can find it. (pjones)
+- Add MultipathDevice.getDMNode(), because .updateSysfsPath() needs it.
+  (pjones)
+- Add MultipathDevice.updateSysfsPath() (pjones)
+- Fix a segfault when stage2= boot parameter and kickstart url method is
+  used (#524417). (rvykydal)
+- Fix parsing of optional portnr in iscsi target IP (#525118) (hdegoede)
+
 * Fri Oct 09 2009 David Cantrell <dcantrell@redhat.com> - 12.36-1
 - Reset PartitionDevice attributes after failed edit. (#498026) (dlehman)
 - Fix cut/paste error in commit 299519d4a0693330ff6a50f3111d61feefabb0da.
diff --git a/configure.ac b/configure.ac
index 9c2653bed..768f85aa2 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], [12.36], [anaconda-devel-list@redhat.com])
+AC_INIT([anaconda], [12.37], [anaconda-devel-list@redhat.com])
 AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2])
 
 AC_CONFIG_SRCDIR([loader/loader.c])
diff --git a/po/anaconda.pot b/po/anaconda.pot
index 4e53557a1..433d26d86 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: anaconda 12.35\n"
+"Project-Id-Version: anaconda 12.36\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2009-10-09 14:42-1000\n"
+"POT-Creation-Date: 2009-10-12 12:30-1000\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"
@@ -43,7 +43,7 @@ msgstr ""
 #: loader/net.c:1914 loader/nfsinstall.c:91 loader/nfsinstall.c:250
 #: loader/nfsinstall.c:269 loader/nfsinstall.c:337 loader/telnetd.c:92
 #: loader/urlinstall.c:83 loader/urlinstall.c:107 loader/urlinstall.c:175
-#: loader/urlinstall.c:451 loader/urlinstall.c:460 loader/urlinstall.c:469
+#: loader/urlinstall.c:451 loader/urlinstall.c:460 loader/urlinstall.c:467
 #: loader/urls.c:292 loader/urls.c:328 loader/urls.c:334 loader/urls.c:346
 #: textw/constants_text.py:44
 msgid "OK"
@@ -124,8 +124,8 @@ msgstr ""
 #: partIntfHelpers.py:237 text.py:308 text.py:312 yuminstall.py:383
 #: yuminstall.py:727 yuminstall.py:841 yuminstall.py:1104 yuminstall.py:1168
 #: yuminstall.py:1327 yuminstall.py:1345 iw/autopart_type.py:99
-#: iw/autopart_type.py:198 iw/autopart_type.py:318 iw/autopart_type.py:321
-#: iw/autopart_type.py:388 iw/autopart_type.py:396 iw/autopart_type.py:425
+#: iw/autopart_type.py:198 iw/autopart_type.py:325 iw/autopart_type.py:328
+#: iw/autopart_type.py:395 iw/autopart_type.py:403 iw/autopart_type.py:432
 #: iw/osbootwidget.py:210 iw/osbootwidget.py:219 iw/raid_dialog_gui.py:724
 #: iw/raid_dialog_gui.py:763 iw/task_gui.py:63 iw/task_gui.py:179
 #: iw/task_gui.py:308 iw/task_gui.py:440 loader/cdinstall.c:228
@@ -139,7 +139,7 @@ msgstr ""
 #: loader/method.c:353 loader/nfsinstall.c:250 loader/nfsinstall.c:269
 #: loader/telnetd.c:92 loader/urlinstall.c:83 loader/urlinstall.c:107
 #: loader/urlinstall.c:175 loader/urls.c:328 loader/urls.c:334
-#: storage/__init__.py:199 storage/__init__.py:1644 storage/__init__.py:1729
+#: storage/__init__.py:200 storage/__init__.py:1645 storage/__init__.py:1730
 #: textw/netconfig_text.py:280 textw/partition_text.py:186
 #: textw/partition_text.py:192 textw/partition_text.py:198
 #: textw/partition_text.py:231 textw/partition_text.py:241
@@ -171,13 +171,13 @@ msgstr ""
 #: upgrade.py:206 yuminstall.py:236 yuminstall.py:660 yuminstall.py:845
 #: yuminstall.py:925 yuminstall.py:931 yuminstall.py:1075 yuminstall.py:1100
 #: yuminstall.py:1158 yuminstall.py:1322 yuminstall.py:1352
-#: storage/__init__.py:95 storage/__init__.py:203 storage/__init__.py:1817
+#: storage/__init__.py:96 storage/__init__.py:204 storage/__init__.py:1818
 msgid "_Exit installer"
 msgstr ""
 
 #: bootloader.py:58 image.py:92 image.py:248 kickstart.py:1357
 #: kickstart.py:1396 upgrade.py:58 yuminstall.py:1163 iw/partition_gui.py:1038
-#: storage/__init__.py:1818
+#: storage/__init__.py:1819
 msgid "_Continue"
 msgstr ""
 
@@ -340,7 +340,7 @@ msgid ""
 msgstr ""
 
 #: gui.py:1257 image.py:164 image.py:194 packages.py:360 packages.py:365
-#: storage/__init__.py:1643
+#: storage/__init__.py:1644
 msgid "_Exit"
 msgstr ""
 
@@ -1126,7 +1126,7 @@ msgid ""
 msgstr ""
 
 #: rescue.py:287 iw/partition_gui.py:544 loader/cdinstall.c:206
-#: loader/cdinstall.c:214 loader/driverdisk.c:444 storage/__init__.py:140
+#: loader/cdinstall.c:214 loader/driverdisk.c:444 storage/__init__.py:141
 #: storage/devicetree.py:84
 msgid "Continue"
 msgstr ""
@@ -1136,7 +1136,7 @@ msgid "Read-Only"
 msgstr ""
 
 #: rescue.py:287 rescue.py:289 loader/cdinstall.c:248 loader/cdinstall.c:251
-#: loader/method.c:326 storage/__init__.py:1643 textw/upgrade_text.py:133
+#: loader/method.c:326 storage/__init__.py:1644 textw/upgrade_text.py:133
 msgid "Skip"
 msgstr ""
 
@@ -1874,31 +1874,31 @@ msgstr ""
 msgid "You must provide an initiator name."
 msgstr ""
 
-#: iw/autopart_type.py:311
+#: iw/autopart_type.py:318
 msgid "Error with Data"
 msgstr ""
 
-#: iw/autopart_type.py:469 iw/autopart_type.py:470
+#: iw/autopart_type.py:476 iw/autopart_type.py:477
 msgid "Rescanning disks"
 msgstr ""
 
-#: iw/autopart_type.py:524 textw/partition_text.py:63
+#: iw/autopart_type.py:531 textw/partition_text.py:63
 msgid "Use entire drive"
 msgstr ""
 
-#: iw/autopart_type.py:525 textw/partition_text.py:64
+#: iw/autopart_type.py:532 textw/partition_text.py:64
 msgid "Replace existing Linux system"
 msgstr ""
 
-#: iw/autopart_type.py:526
+#: iw/autopart_type.py:533
 msgid "Shrink current system"
 msgstr ""
 
-#: iw/autopart_type.py:527 textw/partition_text.py:65
+#: iw/autopart_type.py:534 textw/partition_text.py:65
 msgid "Use free space"
 msgstr ""
 
-#: iw/autopart_type.py:528
+#: iw/autopart_type.py:535
 msgid "Create custom layout"
 msgstr ""
 
@@ -2531,7 +2531,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: iw/partition_gui.py:367 storage/__init__.py:1643
+#: iw/partition_gui.py:367 storage/__init__.py:1644
 msgid "Format"
 msgstr ""
 
@@ -3283,7 +3283,7 @@ msgstr ""
 #: loader/kbd.c:119 loader/loader.c:483 loader/loader.c:503
 #: loader/loader.c:1375 loader/loader.c:1408 loader/net.c:582 loader/net.c:953
 #: loader/net.c:1880 loader/net.c:1902 loader/nfsinstall.c:91
-#: loader/urls.c:292 storage/__init__.py:140 storage/devicetree.py:84
+#: loader/urls.c:292 storage/__init__.py:141 storage/devicetree.py:84
 #: textw/constants_text.py:52
 msgid "Back"
 msgstr ""
@@ -3390,7 +3390,7 @@ msgstr ""
 #: loader/kickstart.c:132 loader/kickstart.c:142 loader/kickstart.c:185
 #: loader/kickstart.c:563 loader/modules.c:339 loader/modules.c:351
 #: loader/net.c:1587 loader/net.c:1608 loader/nfsinstall.c:337
-#: loader/urlinstall.c:451 loader/urlinstall.c:460 loader/urlinstall.c:469
+#: loader/urlinstall.c:451 loader/urlinstall.c:460 loader/urlinstall.c:467
 msgid "Kickstart Error"
 msgstr ""
 
@@ -3973,7 +3973,7 @@ msgstr ""
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: loader/urlinstall.c:470
+#: loader/urlinstall.c:468
 #, c-format
 msgid "Unknown Url method %s"
 msgstr ""
@@ -4018,195 +4018,195 @@ msgstr ""
 msgid "Loading %s driver"
 msgstr ""
 
-#: storage/__init__.py:91
+#: storage/__init__.py:92
 msgid "Unknown Device"
 msgstr ""
 
-#: storage/__init__.py:92
+#: storage/__init__.py:93
 #, python-format
 msgid ""
 "The installation source given by device %s could not be found.  Please check "
 "your parameters and try again."
 msgstr ""
 
-#: storage/__init__.py:103
+#: storage/__init__.py:104
 msgid "Installation cannot continue."
 msgstr ""
 
-#: storage/__init__.py:104
+#: storage/__init__.py:105
 msgid ""
 "The storage configuration you have chosen has already been activated. You "
 "can no longer return to the disk editing screen. Would you like to continue "
 "with the installation process?"
 msgstr ""
 
-#: storage/__init__.py:132
+#: storage/__init__.py:133
 msgid "Encrypt device?"
 msgstr ""
 
-#: storage/__init__.py:133
+#: storage/__init__.py:134
 msgid ""
 "You specified block device encryption should be enabled, but you have not "
 "supplied a passphrase. If you do not go back and provide a passphrase, block "
 "device encryption will be disabled."
 msgstr ""
 
-#: storage/__init__.py:156
+#: storage/__init__.py:157
 msgid "Writing storage configuration to disk"
 msgstr ""
 
-#: storage/__init__.py:157
+#: storage/__init__.py:158
 msgid ""
 "The partitioning options you have selected will now be written to disk.  Any "
 "data on deleted or reformatted partitions will be lost."
 msgstr ""
 
-#: storage/__init__.py:162
+#: storage/__init__.py:163
 msgid "Go _back"
 msgstr ""
 
-#: storage/__init__.py:163
+#: storage/__init__.py:164
 msgid "_Write changes to disk"
 msgstr ""
 
-#: storage/__init__.py:183
+#: storage/__init__.py:184
 msgid "Running..."
 msgstr ""
 
-#: storage/__init__.py:184
+#: storage/__init__.py:185
 msgid "Storing encryption keys"
 msgstr ""
 
-#: storage/__init__.py:200
+#: storage/__init__.py:201
 #, python-format
 msgid "Error storing an encryption key: %s\n"
 msgstr ""
 
-#: storage/__init__.py:317
+#: storage/__init__.py:318
 msgid "Finding Devices"
 msgstr ""
 
-#: storage/__init__.py:318
+#: storage/__init__.py:319
 msgid "Finding storage devices"
 msgstr ""
 
-#: storage/__init__.py:559
+#: storage/__init__.py:560
 msgid "This partition is holding the data for the hard drive install."
 msgstr ""
 
-#: storage/__init__.py:564
+#: storage/__init__.py:565
 msgid "You cannot delete a partition of a LDL formatted DASD."
 msgstr ""
 
-#: storage/__init__.py:570
+#: storage/__init__.py:571
 #, python-format
 msgid "This device is part of the RAID device %s."
 msgstr ""
 
-#: storage/__init__.py:573
+#: storage/__init__.py:574
 msgid "This device is part of a RAID device."
 msgstr ""
 
-#: storage/__init__.py:578
+#: storage/__init__.py:579
 #, python-format
 msgid "This device is part of the LVM volume group '%s'."
 msgstr ""
 
-#: storage/__init__.py:581
+#: storage/__init__.py:582
 msgid "This device is part of a LVM volume group."
 msgstr ""
 
-#: storage/__init__.py:597
+#: storage/__init__.py:598
 msgid ""
 "This device is an extended partition which contains logical partitions that "
 "cannot be deleted:\n"
 "\n"
 msgstr ""
 
-#: storage/__init__.py:869
+#: storage/__init__.py:870
 #, python-format
 msgid ""
 "You have not defined a root partition (/), which is required for "
 "installation of %s to continue."
 msgstr ""
 
-#: storage/__init__.py:874
+#: storage/__init__.py:875
 #, python-format
 msgid ""
 "Your root partition is less than 250 megabytes which is usually too small to "
 "install %s."
 msgstr ""
 
-#: storage/__init__.py:880
+#: storage/__init__.py:881
 #, python-format
 msgid ""
 "Your / partition is less than %s MB which is lower than recommended for a "
 "normal %s install."
 msgstr ""
 
-#: storage/__init__.py:890
+#: storage/__init__.py:891
 #, python-format
 msgid ""
 "Your / partition does not match the the live image you are installing from.  "
 "It must be formatted as %s."
 msgstr ""
 
-#: storage/__init__.py:897
+#: storage/__init__.py:898
 #, python-format
 msgid ""
 "Your %s partition is less than %s megabytes which is lower than recommended "
 "for a normal %s install."
 msgstr ""
 
-#: storage/__init__.py:924
+#: storage/__init__.py:925
 msgid ""
 "Installing on a USB device.  This may or may not produce a working system."
 msgstr ""
 
-#: storage/__init__.py:927
+#: storage/__init__.py:928
 msgid ""
 "Installing on a FireWire device.  This may or may not produce a working "
 "system."
 msgstr ""
 
-#: storage/__init__.py:934
+#: storage/__init__.py:935
 msgid ""
 "You have not specified a swap partition.  Due to the amount of memory "
 "present, a swap partition is required to complete installation."
 msgstr ""
 
-#: storage/__init__.py:939
+#: storage/__init__.py:940
 msgid ""
 "You have not specified a swap partition.  Although not strictly required in "
 "all cases, it will significantly improve performance for most installations."
 msgstr ""
 
-#: storage/__init__.py:946
+#: storage/__init__.py:947
 #, python-format
 msgid ""
 "This mount point is invalid.  The %s directory must be on the / file system."
 msgstr ""
 
-#: storage/__init__.py:950
+#: storage/__init__.py:951
 #, python-format
 msgid "The mount point %s must be on a linux file system."
 msgstr ""
 
-#: storage/__init__.py:961
+#: storage/__init__.py:962
 msgid "No Drives Found"
 msgstr ""
 
-#: storage/__init__.py:962
+#: storage/__init__.py:963
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "file systems. Please check your hardware for the cause of this problem."
 msgstr ""
 
-#: storage/__init__.py:1194 storage/__init__.py:1203
+#: storage/__init__.py:1195 storage/__init__.py:1204
 msgid "Dirty File Systems"
 msgstr ""
 
-#: storage/__init__.py:1195
+#: storage/__init__.py:1196
 #, python-format
 msgid ""
 "The following file systems for your Linux system were not unmounted "
@@ -4215,7 +4215,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: storage/__init__.py:1204
+#: storage/__init__.py:1205
 #, python-format
 msgid ""
 "The following file systems for your Linux system were not unmounted "
@@ -4223,7 +4223,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: storage/__init__.py:1676
+#: storage/__init__.py:1677
 #, python-format
 msgid ""
 "The swap device:\n"
@@ -4234,7 +4234,7 @@ msgid ""
 "swap space, you must reformat as a new-style Linux swap partition."
 msgstr ""
 
-#: storage/__init__.py:1687
+#: storage/__init__.py:1688
 #, python-format
 msgid ""
 "The swap device:\n"
@@ -4246,7 +4246,7 @@ msgid ""
 "down your system rather than hibernating it."
 msgstr ""
 
-#: storage/__init__.py:1695
+#: storage/__init__.py:1696
 #, python-format
 msgid ""
 "The swap device:\n"
@@ -4258,7 +4258,7 @@ msgid ""
 "make sure the installer is set to format all swap devices."
 msgstr ""
 
-#: storage/__init__.py:1707
+#: storage/__init__.py:1708
 #, python-format
 msgid ""
 "The swap device:\n"
@@ -4269,7 +4269,7 @@ msgid ""
 "you will need to format the device or skip it."
 msgstr ""
 
-#: storage/__init__.py:1718
+#: storage/__init__.py:1719
 #, python-format
 msgid ""
 "Error enabling swap device %s: %s\n"
@@ -4280,7 +4280,7 @@ msgid ""
 "Press OK to exit the installer"
 msgstr ""
 
-#: storage/__init__.py:1724
+#: storage/__init__.py:1725
 #, python-format
 msgid ""
 "Error enabling swap device %s: %s\n"
@@ -4290,11 +4290,11 @@ msgid ""
 "Press OK to exit the installer."
 msgstr ""
 
-#: storage/__init__.py:1784 storage/__init__.py:1794
+#: storage/__init__.py:1785 storage/__init__.py:1795
 msgid "Invalid mount point"
 msgstr ""
 
-#: storage/__init__.py:1785
+#: storage/__init__.py:1786
 #, python-format
 msgid ""
 "An error occurred when trying to create %s.  Some element of this path is "
@@ -4303,7 +4303,7 @@ msgid ""
 "Press <Enter> to exit the installer."
 msgstr ""
 
-#: storage/__init__.py:1795
+#: storage/__init__.py:1796
 #, python-format
 msgid ""
 "An error occurred when trying to create %s: %s.  This is a fatal error and "
@@ -4312,18 +4312,18 @@ msgid ""
 "Press <Enter> to exit the installer."
 msgstr ""
 
-#: storage/__init__.py:1808 storage/__init__.py:1829
+#: storage/__init__.py:1809 storage/__init__.py:1830
 msgid "Unable to mount filesystem"
 msgstr ""
 
-#: storage/__init__.py:1809
+#: storage/__init__.py:1810
 #, python-format
 msgid ""
 "An error occurred mounting device %s as %s.  You may continue installation, "
 "but there may be problems."
 msgstr ""
 
-#: storage/__init__.py:1830
+#: storage/__init__.py:1831
 #, python-format
 msgid ""
 "An error occurred mounting device %s as %s: %s. This is a fatal error and "