Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > d536e3b2143fe88c174c968d683c0f4f > files > 34

conga-0.12.2-24.el5_6.1.src.rpm

diff -ur a/luci/cluster/resource-form-macros b/luci/cluster/resource-form-macros
--- a/luci/cluster/resource-form-macros	2010-09-27 01:43:06.000000000 -0400
+++ b/luci/cluster/resource-form-macros	2010-09-27 01:44:22.000000000 -0400
@@ -478,6 +478,12 @@
 					<option name="ext2" value="ext2"
 						tal:content="string: ext2"
 						tal:attributes="selected python: fstype == 'ext2' and 'selected'" />
+					<option name="ext4" value="ext4"
+						tal:content="string: ext4"
+						tal:attributes="selected python: fstype == 'ext4' and 'selected'" />
+					<option name="xfs" value="xfs"
+						tal:content="string: xfs"
+						tal:attributes="selected python: fstype == 'xfs' and 'selected'" />
 				</select>
 			</td>
 		</tr>
diff -ur a/luci/site/luci/Extensions/conga_storage_constants.py b/luci/site/luci/Extensions/conga_storage_constants.py
--- a/luci/site/luci/Extensions/conga_storage_constants.py	2010-09-27 01:43:06.000000000 -0400
+++ b/luci/site/luci/Extensions/conga_storage_constants.py	2010-09-27 01:46:06.000000000 -0400
@@ -80,7 +80,7 @@
 	'fstab':					'List in /etc/fstab',
 	'fstabpoint':				'/etc/fstab Mountpoint',
 	'gfs_fsname':				'Unique GFS Name',
-	'has_journal':				'Journaling Enabled - ext3',
+	'has_journal':				'Journaling Enabled - ext3, ext4',
 	'journals_num':				'Number of Journals',
 	'journal_size':				'Journal Size',
 	'label':					'Label',