mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-28 21:07:56 +00:00
Code Issues Releases Wiki Activity

Add an empty install-debian: target to keep the makefile from blowing up

Browse Source 
when running on Debian/Ubuntu systems and also make the init script skip
*.dpkg-new files when loading profiles.
This commit is contained in:
Jesse Michael 2007-03-30 16:09:50 +00:00
parent 3d84f865c9
commit bef39bbff8
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
parser/Makefile
View File

@ -214,6 +214,9 @@ install-slackware:
install -m 755 -d $(DESTDIR)/etc/rc.d install -m 755 -d $(DESTDIR)/etc/rc.d
install -m 755 rc.apparmor.$(subst install-,,$(@)) $(DESTDIR)/etc/rc.d/rc.apparmor install -m 755 rc.apparmor.$(subst install-,,$(@)) $(DESTDIR)/etc/rc.d/rc.apparmor
.PHONY: install-debian
install-debian:
INSTALLDEPS=$(TOOLS) INSTALLDEPS=$(TOOLS)
ifdef DISTRO ifdef DISTRO
INSTALLDEPS+=install-$(DISTRO) INSTALLDEPS+=install-$(DISTRO)

1
parser/rc.apparmor.functions
View File

@ -137,6 +137,7 @@ parse_profiles() {
for profile in $PROFILE_DIR/*; do for profile in $PROFILE_DIR/*; do
if [ "${profile%.rpmnew}" != "${profile}" -o \ if [ "${profile%.rpmnew}" != "${profile}" -o \
"${profile%.rpmsave}" != "${profile}" -o \ "${profile%.rpmsave}" != "${profile}" -o \
"${profile%.dpkg-new}" != "${profile}" -o \
"${profile%\~}" != "${profile}" ] "${profile%\~}" != "${profile}" ]
then then
echo " Skipping profile $profile" echo " Skipping profile $profile"