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

Collapse commands with grep piped to sed into one sed command.

This commit is contained in:
Chris PeBenito 2006-01-23 20:53:40 +00:00
parent 908390511e
commit 7dca64fa48
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
refpolicy/Changelog
View File

@ -1,3 +1,4 @@
- Collapse commands with grep piped to sed into one sed command.
- Fix type_change bug in term_user_pty().
- Move ice_tmp_t from miscfiles to xserver.
- Login fixes from Serge Hallyn.

9
refpolicy/Makefile
View File

@ -250,9 +250,8 @@ $(USERPATH)/system.users: $(M4SUPPORT) tmp/generated_definitions.conf $(USER_FIL
@echo "# This file is replaced on reinstalls of this policy." >> tmp/system.users
@echo "# Please edit local.users to make local changes." >> tmp/system.users
@echo "#" >> tmp/system.users
$(QUIET) m4 -D self_contained_policy $(M4PARAM) $^ | \
egrep -v "^[[:blank:]]*($$|#)" | \
sed -r -e 's/^[[:blank:]]+//' >> tmp/system.users
$(QUIET) m4 -D self_contained_policy $(M4PARAM) $^ | sed -r -e 's/^[[:blank:]]+//' \
-e '/^[[:blank:]]*($$|#)/d' >> tmp/system.users
$(QUIET) install -m 644 tmp/system.users $@
$(USERPATH)/local.users: config/local.users
@ -268,8 +267,8 @@ install-appconfig: $(APPFILES)
$(INSTALLDIR)/booleans: $(BOOLEANS)
@mkdir -p $(INSTALLDIR)
$(QUIET) egrep '^[[:blank:]]*[[:alpha:]]' $(BOOLEANS) \
| sed -e 's/false/0/g' -e 's/true/1/g' > tmp/booleans
$(QUIET) sed -r -e 's/false/0/g' -e 's/true/1/g' \
-e '/^[[:blank:]]*($$|#)/d' $(BOOLEANS) | sort > tmp/booleans
$(QUIET) install -m 644 tmp/booleans $@
$(CONTEXTPATH)/files/media: $(APPCONF)/media