Commit 3aa18589 authored by Mike Hibler's avatar Mike Hibler

Fix to reflect new injail

parent 54f1bf5a
......@@ -18,7 +18,7 @@ SUBDIR = tmcd/freebsd
include $(OBJDIR)/Makeconf
all: supfile
all: supfile injail
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -32,6 +32,9 @@ RCDIR = $(DESTDIR)/usr/local/etc/rc.d
ISMFS = $(ETCDIR)/ismfs
INSTALL = /usr/bin/install -c
injail: $(SRCDIR)/jail/injail.c
$(CC) $(CFLAGS) -O2 -o injail $<
install: common-install etc-install \
sup-install script-install bin-install jail-install
@echo "Remember to install the PEM files if necessary"
......@@ -139,10 +142,10 @@ jail-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/jail/rc.conf $(JAILDIR)/rc.conf
$(INSTALL) -m 755 $(SRCDIR)/jail/rc.local $(JAILDIR)/rc.local
$(INSTALL) -m 755 $(SRCDIR)/jail/rc.injail $(BINDIR)/rc.injail
$(INSTALL) -m 755 $(SRCDIR)/jail/injail.pl $(JAILDIR)/injail.pl
$(INSTALL) -m 755 $(SRCDIR)/jail/crontab $(JAILDIR)/crontab
$(INSTALL) -m 755 $(SRCDIR)/jail/jailsetup $(BINDIR)/jailsetup
$(INSTALL) -m 755 $(SRCDIR)/jail/mkjail.pl $(BINDIR)/mkjail.pl
$(INSTALL) -m 755 ./injail $(JAILDIR)/injail
# Invoked from ../ron
remote-install: jail-install
......@@ -161,3 +164,6 @@ locrem-install:
$(INSTALL) -m 755 $(SRCDIR)/cpuspeed.awk $(BINDIR)/cpuspeed.awk
$(INSTALL) -m 755 $(SRCDIR)/control_interface \
$(BINDIR)/control_interface
clean:
/bin/rm -f supfile injail
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment