- change option -c to -Z to match newer upstream SElinux conventions

diff --git a/include/usage.h b/include/usage.h
index 23703736fd742d9a8119b0d76bfa96ceeb07274e..7abd9ef7d8871f4036515cc053742c0f1ed6580c 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -2575,7 +2575,7 @@
        "Report process status\n" \
        USAGE_PS \
        USE_SELINUX( \
-       "\n     -c      Show SE Linux context") \
+       "\n     -Z      Show SE Linux context") \
        USE_FEATURE_PS_WIDE( \
        "\n     w       Wide output")
 

diff --git a/procps/ps.c b/procps/ps.c
index c06d333cdf4f0e27e0490bccb1ad6b45f60fe54f..c1cb64397e4a17c339dfcbc521272a493130d15a 100644 (file)
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -298,7 +298,7 @@ int ps_main(int argc, char **argv)
 #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX
 #if ENABLE_FEATURE_PS_WIDE
        opt_complementary = "-:ww";
-       USE_SELINUX(i =) getopt32(argc, argv, USE_SELINUX("c") "w", &w_count);
+       USE_SELINUX(i =) getopt32(argc, argv, USE_SELINUX("Z") "w", &w_count);
        /* if w is given once, GNU ps sets the width to 132,
         * if w is given more than once, it is "unlimited"
         */
@@ -310,7 +310,7 @@ int ps_main(int argc, char **argv)
                terminal_width--;
        }
 #else /* only ENABLE_SELINUX */
-       i = getopt32(argc, argv, "c");
+       i = getopt32(argc, argv, "Z");
 #endif
 #if ENABLE_SELINUX
        if ((i & 1) && is_selinux_enabled())