All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit be5963f9 authored by Mike Hibler's avatar Mike Hibler

Install ops' fetchtar.proxy via opsdir and the boss-install

parent 4d2efdcd
......@@ -37,9 +37,11 @@ SBIN_STUFF = resetvlans console_setup.proxy sched_reload named_setup \
elabinelab snmpit.proxy panic repos_daemon node_attributes \
nfstrace plabinelab smbpasswd_setup smbpasswd_setup.proxy
CTRLBIN_STUFF = console_setup.proxy sfskey_update.proxy \
CTRLSBIN_STUFF = console_setup.proxy sfskey_update.proxy \
savelogs.proxy eventsys.proxy
CTRLBIN_STUFF = fetchtar.proxy
FSBIN_STUFF = exports_setup.proxy smbpasswd_setup.proxy
LIBEXEC_STUFF = rmproj wanlinksolve wanlinkinfo \
......@@ -149,7 +151,8 @@ script-install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_STUFF)) \
$(addprefix $(INSTALL_LIBDIR)/, $(LIB_STUFF)) \
$(addprefix $(INSTALL_LIBEXECDIR)/, $(LIBEXEC_STUFF)) \
$(addprefix $(INSTALL_DIR)/opsdir/lib/, libtestbed.pm) \
$(addprefix $(INSTALL_DIR)/opsdir/sbin/, $(CTRLBIN_STUFF)) \
$(addprefix $(INSTALL_DIR)/opsdir/bin/, $(CTRLBIN_STUFF)) \
$(addprefix $(INSTALL_DIR)/opsdir/sbin/, $(CTRLSBIN_STUFF))\
$(addprefix $(INSTALL_DIR)/opsdir/sbin/, $(FSBIN_STUFF))
post-install:
......@@ -214,8 +217,8 @@ endif
#
# Control node installation (okay, plastic)
#
control-install: $(addprefix $(INSTALL_SBINDIR)/, $(CTRLBIN_STUFF)) \
$(addprefix $(INSTALL_BINDIR)/, fetchtar.proxy) \
control-install: $(addprefix $(INSTALL_SBINDIR)/, $(CTRLSBIN_STUFF)) \
$(addprefix $(INSTALL_BINDIR)/, $(CTRLBIN_STUFF)) \
$(addprefix $(INSTALL_LIBDIR)/, libtestbed.pm)
@$(MAKE) -C ns2ir control-install
@$(MAKE) -C nsverify control-install
......@@ -266,6 +269,11 @@ $(INSTALL_DIR)/opsdir/lib/%: %
-mkdir -p $(INSTALL_DIR)/opsdir/lib
$(INSTALL) $< $@
$(INSTALL_DIR)/opsdir/bin/%: %
@echo "Installing $<"
-mkdir -p $(INSTALL_DIR)/opsdir/bin
$(INSTALL) $< $@
$(INSTALL_DIR)/opsdir/sbin/%: %
@echo "Installing $<"
-mkdir -p $(INSTALL_DIR)/opsdir/sbin
......
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