[selinux-policy: 2224/3172] Add btrfs and ext4 to labeling targets.
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Oct 7 22:17:27 UTC 2010
commit 0f5e26b620b22ed1f05faf4a8ee5891dc6b51c67
Author: Chris PeBenito <cpebenito at tresys.com>
Date: Tue Aug 11 09:01:58 2009 -0400
Add btrfs and ext4 to labeling targets.
Changelog | 1 +
Makefile | 11 ++++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/Changelog b/Changelog
index 9e97eab..d2d030c 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,4 @@
+- Add btrfs and ext4 to labeling targets.
- Fix infrastructure to expand macros in initrc_context when installing.
- Handle unix_chkpwd usage by useradd and groupadd.
- Add missing compatibility aliases for xdm_xserver*_t types.
diff --git a/Makefile b/Makefile
index 57b3b10..72f4ff9 100644
--- a/Makefile
+++ b/Makefile
@@ -303,7 +303,8 @@ off_mods += $(filter-out $(cmdline_off) $(cmdline_base) $(cmdline_mods), $(mod_c
off_mods += $(filter-out $(base_mods) $(mod_mods) $(off_mods),$(notdir $(detected_mods)))
# filesystems to be used in labeling targets
-filesystems = $(shell mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[23]| xfs| jfs).*rw/{print $$3}';)
+filesystems = $(shell mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[234]|btrfs| xfs| jfs).*rw/{print $$3}';)
+fs_names := "btrfs ext2 ext3 ext4 xfs jfs"
########################################
#
@@ -604,7 +605,7 @@ $(tags):
# Filesystem labeling
#
checklabels:
- @echo "Checking labels on filesystem types: ext2 ext3 xfs jfs"
+ @echo "Checking labels on filesystem types: $(fs_names)"
@if test -z "$(filesystems)"; then \
echo "No filesystems with extended attributes found!" ;\
false ;\
@@ -612,7 +613,7 @@ checklabels:
$(verbose) $(SETFILES) -v -n $(fcpath) $(filesystems)
restorelabels:
- @echo "Restoring labels on filesystem types: ext2 ext3 xfs jfs"
+ @echo "Restoring labels on filesystem types: $(fs_names)"
@if test -z "$(filesystems)"; then \
echo "No filesystems with extended attributes found!" ;\
false ;\
@@ -620,7 +621,7 @@ restorelabels:
$(verbose) $(SETFILES) -v $(fcpath) $(filesystems)
relabel:
- @echo "Relabeling filesystem types: ext2 ext3 xfs jfs"
+ @echo "Relabeling filesystem types: $(fs_names)"
@if test -z "$(filesystems)"; then \
echo "No filesystems with extended attributes found!" ;\
false ;\
@@ -628,7 +629,7 @@ relabel:
$(verbose) $(SETFILES) $(fcpath) $(filesystems)
resetlabels:
- @echo "Resetting labels on filesystem types: ext2 ext3 xfs jfs"
+ @echo "Resetting labels on filesystem types: $(fs_names)"
@if test -z "$(filesystems)"; then \
echo "No filesystems with extended attributes found!" ;\
false ;\
More information about the scm-commits
mailing list