diff options
author | Glenn Washburn <development@efficientek.com> | 2019-08-29 21:35:48 -0500 |
---|---|---|
committer | Glenn Washburn <development@efficientek.com> | 2019-08-29 21:35:48 -0500 |
commit | dbff5520e049bd5a18bc5e26e3a41be6bf637a4a (patch) | |
tree | efd56960776fb7a9be2ad8c5c79ee1017c97e4d7 | |
parent | Merge branch 'master' of https://github.com/netblue30/firejail (diff) | |
download | firejail-dbff5520e049bd5a18bc5e26e3a41be6bf637a4a.tar.gz firejail-dbff5520e049bd5a18bc5e26e3a41be6bf637a4a.tar.zst firejail-dbff5520e049bd5a18bc5e26e3a41be6bf637a4a.zip |
Profile builder helper should use correct firejail binary path.
-rw-r--r-- | src/common.mk.in | 6 | ||||
-rw-r--r-- | src/fbuilder/build_profile.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/common.mk.in b/src/common.mk.in index ff66c6748..1464ab9b2 100644 --- a/src/common.mk.in +++ b/src/common.mk.in | |||
@@ -3,6 +3,7 @@ | |||
3 | CC=@CC@ | 3 | CC=@CC@ |
4 | prefix=@prefix@ | 4 | prefix=@prefix@ |
5 | exec_prefix=@exec_prefix@ | 5 | exec_prefix=@exec_prefix@ |
6 | bindir=@bindir@ | ||
6 | libdir=@libdir@ | 7 | libdir=@libdir@ |
7 | sysconfdir=@sysconfdir@ | 8 | sysconfdir=@sysconfdir@ |
8 | 9 | ||
@@ -29,7 +30,10 @@ C_FILE_LIST = $(sort $(wildcard *.c)) | |||
29 | OBJS = $(C_FILE_LIST:.c=.o) | 30 | OBJS = $(C_FILE_LIST:.c=.o) |
30 | BINOBJS = $(foreach file, $(OBJS), $file) | 31 | BINOBJS = $(foreach file, $(OBJS), $file) |
31 | 32 | ||
32 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_OVERLAYFS) $(HAVE_FIRETUNNEL) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security | 33 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) |
34 | CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' | ||
35 | CFLAGS += $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_OVERLAYFS) $(HAVE_FIRETUNNEL) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_WHITELIST) | ||
36 | CFLAGS += -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security | ||
33 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread | 37 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread |
34 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | 38 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ |
35 | 39 | ||
diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c index f11e37057..83fe4b188 100644 --- a/src/fbuilder/build_profile.c +++ b/src/fbuilder/build_profile.c | |||
@@ -67,7 +67,7 @@ void build_profile(int argc, char **argv, int index, FILE *fp) { | |||
67 | errExit("asprintf"); | 67 | errExit("asprintf"); |
68 | 68 | ||
69 | char *cmdlist[] = { | 69 | char *cmdlist[] = { |
70 | "/usr/bin/firejail", | 70 | BINDIR "/firejail", |
71 | "--quiet", | 71 | "--quiet", |
72 | output, | 72 | output, |
73 | "--noprofile", | 73 | "--noprofile", |