summaryrefslogtreecommitdiff
path: root/rpmpopt.in
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2007-09-03 15:15:50 +0300
committerPanu Matilainen <pmatilai@redhat.com>2007-09-03 15:15:50 +0300
commitc0bd72b026c871e672ff111d5b9827edc28aa106 (patch)
tree0f233e7cb458a20a493f30c3b994cd417390ed6c /rpmpopt.in
parent97cea31a8aa73995358d671ded2ace7878748382 (diff)
downloadrpm-c0bd72b026c871e672ff111d5b9827edc28aa106.tar.gz
Rip out unnecessary selinux babbage.
- rpm doesn't manage selinux contexts so it doesn't need to know about them other than when creating files - implement --fscontext as popt alias since it's easy to do so...
Diffstat (limited to 'rpmpopt.in')
-rw-r--r--rpmpopt.in19
1 files changed, 6 insertions, 13 deletions
diff --git a/rpmpopt.in b/rpmpopt.in
index 1339c1ce2..b26ca3181 100644
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -109,11 +109,9 @@ rpm alias --fileclass --qf '[%{FILENAMES}\t%{FILECLASS}\n]' \
rpm alias --filecolor --qf '[%{FILENAMES}\t%{FILECOLORS}\n]' \
--POPTdesc=$"list file names with colors"
-rpm alias --fscontext --qf '[%{FILENAMES}\t%{FSCONTEXTS}\n]' \
- --POPTdesc=$"list file names with security context from file system"
-
-rpm alias --recontext --qf '[%{FILENAMES}\t%{RECONTEXTS}\n]' \
- --POPTdesc=$"list file names with security context from policy RE"
+rpm alias --fscontext --qf '[%{FILENAMES}\n]' \
+ --pipe "xargs ls --scontext | awk '{printf(\"%s %s\n\", $2, $1)}'" \
+ --POPTdesc=$"list file names with security context from file system"
rpm alias --fileprovide --qf '[%{FILENAMES}\t%{FILEPROVIDE}\n]' \
--POPTdesc=$"list file names with provides"
@@ -486,14 +484,9 @@ rpmquery alias --fileclass --qf '[%{FILENAMES}\t%{FILECLASS}\n]' \
rpmquery alias --filecolor --qf '[%{FILENAMES}\t%{FILECOLORS}\n]' \
--POPTdesc=$"list file names with colors"
-rpmquery alias --filecontext --qf '[%{FILENAMES}\t%{FILECONTEXTS}\n]' \
- --POPTdesc=$"list file names with security context"
-
-rpmquery alias --fscontext --qf '[%{FILENAMES}\t%{FSCONTEXTS}\n]' \
- --POPTdesc=$"list file names with security context from file system"
-
-rpmquery alias --recontext --qf '[%{FILENAMES}\t%{RECONTEXTS}\n]' \
- --POPTdesc=$"list file names with security context from policy RE"
+rpmquery alias --fscontext --qf '[%{FILENAMES}\n]' \
+ --pipe "xargs ls --scontext | awk '{printf(\"%s %s\n\", $2, $1)}'" \
+ --POPTdesc=$"list file names with security context from file system"
rpmquery alias --fileprovide --qf '[%{FILENAMES}\t%{FILEPROVIDE}\n]' \
--POPTdesc=$"list file names with provides"