diff options
author | smitsohu <smitsohu@gmail.com> | 2020-07-16 23:47:57 +0200 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2020-07-16 23:47:57 +0200 |
commit | ec194d2f70b09f332637c43f56dcab1f78a965da (patch) | |
tree | b0b14cd74bcfb1e6452d451c5cff15febd527c76 | |
parent | fix #3501 (diff) | |
download | firejail-ec194d2f70b09f332637c43f56dcab1f78a965da.tar.gz firejail-ec194d2f70b09f332637c43f56dcab1f78a965da.tar.zst firejail-ec194d2f70b09f332637c43f56dcab1f78a965da.zip |
fixing busybox workaround
-rw-r--r-- | Makefile.in | 7 | ||||
-rwxr-xr-x | 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 | |||
117 | # documents | 117 | # documents |
118 | install -m 0755 -d $(DESTDIR)$(DOCDIR) | 118 | install -m 0755 -d $(DESTDIR)$(DOCDIR) |
119 | install -m 0644 -t $(DESTDIR)$(DOCDIR) COPYING README RELNOTES etc/templates/* | 119 | install -m 0644 -t $(DESTDIR)$(DOCDIR) COPYING README RELNOTES etc/templates/* |
120 | ifeq ($(BUSYBOX_WORKAROUND),yes) | 120 | # profiles and settings |
121 | ./mketc.sh | ||
122 | endif | ||
123 | install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail | 121 | install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail |
124 | 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 | 122 | 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 |
125 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" | 123 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" |
124 | ifeq ($(BUSYBOX_WORKAROUND),yes) | ||
125 | ./mketc.sh $(DESTDIR)$(sysconfdir)/firejail/disable-common.inc | ||
126 | endif | ||
126 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) | 127 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) |
127 | # install apparmor profile | 128 | # install apparmor profile |
128 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;" | 129 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;" |
@@ -14,4 +14,4 @@ noblacklist \${PATH}/nc\ | |||
14 | noblacklist \${PATH}/su\ | 14 | noblacklist \${PATH}/su\ |
15 | noblacklist \${PATH}/sudo\ | 15 | noblacklist \${PATH}/sudo\ |
16 | noblacklist \${PATH}/umount\ | 16 | noblacklist \${PATH}/umount\ |
17 | ' etc/disable-common.inc | 17 | ' "$1" |