rpms
/
selinux-policy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add btrfs and ext4 to labeling targets.

This commit is contained in:
Chris PeBenito 2009-08-11 09:01:58 -04:00
parent 90286f4292
commit 0f5e26b620
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -1,3 +1,4 @@
- Add btrfs and ext4 to labeling targets.
- Fix infrastructure to expand macros in initrc_context when installing. - Fix infrastructure to expand macros in initrc_context when installing.
- Handle unix_chkpwd usage by useradd and groupadd. - Handle unix_chkpwd usage by useradd and groupadd.
- Add missing compatibility aliases for xdm_xserver*_t types. - Add missing compatibility aliases for xdm_xserver*_t types.

11
Makefile
View File

@ -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))) off_mods += $(filter-out $(base_mods) $(mod_mods) $(off_mods),$(notdir $(detected_mods)))
# filesystems to be used in labeling targets # 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 # Filesystem labeling
# #
checklabels: checklabels:
@echo "Checking labels on filesystem types: ext2 ext3 xfs jfs" @echo "Checking labels on filesystem types: $(fs_names)"
@if test -z "$(filesystems)"; then \ @if test -z "$(filesystems)"; then \
echo "No filesystems with extended attributes found!" ;\ echo "No filesystems with extended attributes found!" ;\
false ;\ false ;\
@ -612,7 +613,7 @@ checklabels:
$(verbose) $(SETFILES) -v -n $(fcpath) $(filesystems) $(verbose) $(SETFILES) -v -n $(fcpath) $(filesystems)
restorelabels: restorelabels:
@echo "Restoring labels on filesystem types: ext2 ext3 xfs jfs" @echo "Restoring labels on filesystem types: $(fs_names)"
@if test -z "$(filesystems)"; then \ @if test -z "$(filesystems)"; then \
echo "No filesystems with extended attributes found!" ;\ echo "No filesystems with extended attributes found!" ;\
false ;\ false ;\
@ -620,7 +621,7 @@ restorelabels:
$(verbose) $(SETFILES) -v $(fcpath) $(filesystems) $(verbose) $(SETFILES) -v $(fcpath) $(filesystems)
relabel: relabel:
@echo "Relabeling filesystem types: ext2 ext3 xfs jfs" @echo "Relabeling filesystem types: $(fs_names)"
@if test -z "$(filesystems)"; then \ @if test -z "$(filesystems)"; then \
echo "No filesystems with extended attributes found!" ;\ echo "No filesystems with extended attributes found!" ;\
false ;\ false ;\
@ -628,7 +629,7 @@ relabel:
$(verbose) $(SETFILES) $(fcpath) $(filesystems) $(verbose) $(SETFILES) $(fcpath) $(filesystems)
resetlabels: resetlabels:
@echo "Resetting labels on filesystem types: ext2 ext3 xfs jfs" @echo "Resetting labels on filesystem types: $(fs_names)"
@if test -z "$(filesystems)"; then \ @if test -z "$(filesystems)"; then \
echo "No filesystems with extended attributes found!" ;\ echo "No filesystems with extended attributes found!" ;\
false ;\ false ;\