From: Karel Zak <kzak@redhat.com>
Date: Mon, 12 Jan 2015 09:58:00 +0000 (+0100)
Subject: partx: add --update to ul_excl_twq list
X-Git-Tag: v2.26-rc1~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08ec8a6fadebd01f74a9ac5860bfd607d9d1b1b5;p=thirdparty%2Futil-linux.git

partx: add --update to ul_excl_twq list

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/partx.8 b/disk-utils/partx.8
index fb0fe381bb..776e22189c 100644
--- a/disk-utils/partx.8
+++ b/disk-utils/partx.8
@@ -88,9 +88,10 @@ Specifies the lower and upper limits (e.g.\& \fB\-\-nr 2:4\fR).
 .TP
 .BR \-o , " \-\-output " \fIlist
 Define the output columns to use for
-.B \-\-show
-and
-.B \-\-raw
+.BR \-\-show ,
+.BR \-\-raw
+or
+.B \-\-pairs
 output.  If no output arrangement is specified, then a default set is
 used.  Use
 .B \-\-help
@@ -99,6 +100,7 @@ to get
 of all supported columns.  This option cannot be combined with the
 .BR \-\-add ,
 .BR \-\-delete ,
+.BR \-\-update
 or
 .B \-\-list
 options.
diff --git a/disk-utils/partx.c b/disk-utils/partx.c
index 00c263173f..c53800f880 100644
--- a/disk-utils/partx.c
+++ b/disk-utils/partx.c
@@ -774,7 +774,7 @@ int main(int argc, char **argv)
 	};
 
 	static const ul_excl_t excl[] = {	/* rows and cols in in ASCII order */
-		{ 'P','a','d','l','r','s' },
+		{ 'P','a','d','l','r','s','u' },
 		{ 0 }
 	};
 	int excl_st[ARRAY_SIZE(excl)] = UL_EXCL_STATUS_INIT;