From ec194d2f70b09f332637c43f56dcab1f78a965da Mon Sep 17 00:00:00 2001 From: smitsohu Date: Thu, 16 Jul 2020 23:47:57 +0200 Subject: fixing busybox workaround --- Makefile.in | 7 ++++--- mketc.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6988ae1d6..65dd430b5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -117,12 +117,13 @@ endif # documents install -m 0755 -d $(DESTDIR)$(DOCDIR) install -m 0644 -t $(DESTDIR)$(DOCDIR) COPYING README RELNOTES etc/templates/* -ifeq ($(BUSYBOX_WORKAROUND),yes) - ./mketc.sh -endif + # profiles and settings install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail etc/profile-a-l/*.profile etc/profile-m-z/*.profile etc/inc/*.inc etc/net/*.net etc/firejail.config sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" +ifeq ($(BUSYBOX_WORKAROUND),yes) + ./mketc.sh $(DESTDIR)$(sysconfdir)/firejail/disable-common.inc +endif ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) # install apparmor profile sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;" diff --git a/mketc.sh b/mketc.sh index 05aa8f79a..8102f58b8 100755 --- a/mketc.sh +++ b/mketc.sh @@ -14,4 +14,4 @@ noblacklist \${PATH}/nc\ noblacklist \${PATH}/su\ noblacklist \${PATH}/sudo\ noblacklist \${PATH}/umount\ -' etc/disable-common.inc +' "$1" -- cgit v1.2.3-54-g00ecf