diff options
Diffstat (limited to 'selinux')
-rw-r--r-- | selinux/chcon.c | 12 | ||||
-rw-r--r-- | selinux/runcon.c | 10 | ||||
-rw-r--r-- | selinux/setfiles.c | 1 |
3 files changed, 10 insertions, 13 deletions
diff --git a/selinux/chcon.c b/selinux/chcon.c index c743013ce..ba9b08638 100644 --- a/selinux/chcon.c +++ b/selinux/chcon.c | |||
@@ -18,8 +18,6 @@ | |||
18 | //config: bool "Enable long options" | 18 | //config: bool "Enable long options" |
19 | //config: default y | 19 | //config: default y |
20 | //config: depends on CHCON && LONG_OPTS | 20 | //config: depends on CHCON && LONG_OPTS |
21 | //config: help | ||
22 | //config: Support long options for the chcon applet. | ||
23 | 21 | ||
24 | //applet:IF_CHCON(APPLET(chcon, BB_DIR_USR_BIN, BB_SUID_DROP)) | 22 | //applet:IF_CHCON(APPLET(chcon, BB_DIR_USR_BIN, BB_SUID_DROP)) |
25 | 23 | ||
@@ -38,11 +36,11 @@ | |||
38 | //usage: "\n -c,--changes Report changes made" | 36 | //usage: "\n -c,--changes Report changes made" |
39 | //usage: "\n -h,--no-dereference Affect symlinks instead of their targets" | 37 | //usage: "\n -h,--no-dereference Affect symlinks instead of their targets" |
40 | //usage: "\n -f,--silent,--quiet Suppress most error messages" | 38 | //usage: "\n -f,--silent,--quiet Suppress most error messages" |
41 | //usage: "\n --reference=RFILE Use RFILE's group instead of using a CONTEXT value" | 39 | //usage: "\n --reference RFILE Use RFILE's group instead of using a CONTEXT value" |
42 | //usage: "\n -u,--user=USER Set user/role/type/range in the target" | 40 | //usage: "\n -u,--user USER Set user/role/type/range in the target" |
43 | //usage: "\n -r,--role=ROLE security context" | 41 | //usage: "\n -r,--role ROLE security context" |
44 | //usage: "\n -t,--type=TYPE" | 42 | //usage: "\n -t,--type TYPE" |
45 | //usage: "\n -l,--range=RANGE" | 43 | //usage: "\n -l,--range RANGE" |
46 | //usage: "\n -R,--recursive Recurse" | 44 | //usage: "\n -R,--recursive Recurse" |
47 | //usage: ) | 45 | //usage: ) |
48 | //usage: IF_NOT_FEATURE_CHCON_LONG_OPTIONS( | 46 | //usage: IF_NOT_FEATURE_CHCON_LONG_OPTIONS( |
diff --git a/selinux/runcon.c b/selinux/runcon.c index 16f171101..82f4d50d3 100644 --- a/selinux/runcon.c +++ b/selinux/runcon.c | |||
@@ -39,8 +39,6 @@ | |||
39 | //config: bool "Enable long options" | 39 | //config: bool "Enable long options" |
40 | //config: default y | 40 | //config: default y |
41 | //config: depends on RUNCON && LONG_OPTS | 41 | //config: depends on RUNCON && LONG_OPTS |
42 | //config: help | ||
43 | //config: Support long options for the runcon applet. | ||
44 | 42 | ||
45 | //applet:IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP)) | 43 | //applet:IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP)) |
46 | 44 | ||
@@ -54,10 +52,10 @@ | |||
54 | //usage: "\n CONTEXT Complete security context\n" | 52 | //usage: "\n CONTEXT Complete security context\n" |
55 | //usage: IF_FEATURE_RUNCON_LONG_OPTIONS( | 53 | //usage: IF_FEATURE_RUNCON_LONG_OPTIONS( |
56 | //usage: "\n -c,--compute Compute process transition context before modifying" | 54 | //usage: "\n -c,--compute Compute process transition context before modifying" |
57 | //usage: "\n -t,--type=TYPE Type (for same role as parent)" | 55 | //usage: "\n -t,--type TYPE Type (for same role as parent)" |
58 | //usage: "\n -u,--user=USER User identity" | 56 | //usage: "\n -u,--user USER User identity" |
59 | //usage: "\n -r,--role=ROLE Role" | 57 | //usage: "\n -r,--role ROLE Role" |
60 | //usage: "\n -l,--range=RNG Levelrange" | 58 | //usage: "\n -l,--range RNG Levelrange" |
61 | //usage: ) | 59 | //usage: ) |
62 | //usage: IF_NOT_FEATURE_RUNCON_LONG_OPTIONS( | 60 | //usage: IF_NOT_FEATURE_RUNCON_LONG_OPTIONS( |
63 | //usage: "\n -c Compute process transition context before modifying" | 61 | //usage: "\n -c Compute process transition context before modifying" |
diff --git a/selinux/setfiles.c b/selinux/setfiles.c index 9fa5d3f30..c14a67be5 100644 --- a/selinux/setfiles.c +++ b/selinux/setfiles.c | |||
@@ -30,6 +30,7 @@ | |||
30 | //config: the same as setfiles, but usage is a little different. | 30 | //config: the same as setfiles, but usage is a little different. |
31 | 31 | ||
32 | //applet:IF_SETFILES(APPLET(setfiles, BB_DIR_SBIN, BB_SUID_DROP)) | 32 | //applet:IF_SETFILES(APPLET(setfiles, BB_DIR_SBIN, BB_SUID_DROP)) |
33 | // APPLET_ODDNAME:name main location suid_type help | ||
33 | //applet:IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, BB_DIR_SBIN, BB_SUID_DROP, restorecon)) | 34 | //applet:IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, BB_DIR_SBIN, BB_SUID_DROP, restorecon)) |
34 | 35 | ||
35 | //kbuild:lib-$(CONFIG_SETFILES) += setfiles.o | 36 | //kbuild:lib-$(CONFIG_SETFILES) += setfiles.o |