Commit 249283c5 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Minor install changes for plastic; smaller set of programs available

to mere users.
parent 91acec70
......@@ -12,6 +12,9 @@ BIN_SCRIPTS = mac2if nalloc nfree nodeip
SBIN_SCRIPTS = avail inuse showgraph if2port backup
LIBEXEC_SCRIPTS = ptopgen
# Stuff installed on plastic for mere users.
USERBINS = nalloc nfree
#
# Force dependencies on the scripts so that they will be rerun through
# configure if the .in file is changed.
......@@ -29,7 +32,7 @@ install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_SCRIPTS)) \
#
control-install:
cd $(INSTALL_BINDIR) && \
list='$(BIN_SCRIPTS)'; for file in $$list; do \
list='$(USERBINS)'; for file in $$list; do \
rm -f $$file; \
ln -s plasticwrap $$file; \
done;
......
......@@ -18,22 +18,11 @@ my $TB = "@prefix@";
# List of allowed commands - Mapping is from command entered by the user
# to the actual binary to run
%allowed = ( "avail" => "$TB/bin/avail",
"inuse" => "$TB/bin/inuse",
"if2port" => "$TB/sbin/if2port",
"mac2if" => "$TB/bin/mac2if",
"nalloc" => "$TB/bin/nalloc",
%allowed = ( "nalloc" => "$TB/bin/nalloc",
"nfree" => "$TB/bin/nfree",
"nodeip" => "$TB/bin/nodeip",
"ns" => "$TB/bin/ns",
"power" => "$TB/bin/power",
"snmpit" => "$TB/bin/snmpit",
"tbprerun" => "$TB/bin/tbprerun",
"tbreport" => "$TB/bin/tbreport",
"tbrun" => "$TB/bin/tbrun",
"tbend" => "$TB/bin/tbend",
"vpower" => "$TB/bin/vpower",
"vsnmpit" => "$TB/bin/vsnmpit");
"node_reboot" => "$TB/bin/node_reboot",
"os_load" => "$TB/bin/os_load",
"snmpit" => "$TB/bin/snmpit");
# Need to provide a simple path, because some scripts we call need one
$ENV{PATH} = "$TB/bin:/bin:/usr/bin:/usr/local/bin";
......
......@@ -15,7 +15,7 @@ BIN_STUFF = power snmpit tbend tbrun tbprerun tbreport \
node_reboot
# Stuff that mere users get on plastic.
USERS_BIN = snmpit os_load node_reboot
USERBINS = snmpit os_load node_reboot
SBIN_STUFF = resetvlans console_setup.proxy sched_reload named_setup \
batch_daemon exports_setup reload_daemon
......@@ -88,7 +88,7 @@ post-install:
control-install: $(addprefix $(INSTALL_SBINDIR)/, console_setup.proxy) \
$(addprefix $(INSTALL_SBINDIR)/, exports_setup.proxy)
cd $(INSTALL_BINDIR) && \
list='$(BIN_STUFF)'; for file in $$list; do \
list='$(USERBINS)'; for file in $$list; do \
rm -f $$file; \
ln -s plasticwrap $$file; \
done;
......
......@@ -10,28 +10,22 @@ include $(OBJDIR)/Makeconf
BIN_SCRIPTS = delay_config
SBIN_SCRIPTS =
LIBEXEC_SCRIPTS =
#
# Force dependencies on the scripts so that they will be rerun through
# configure if the .in file is changed.
#
all: $(BIN_SCRIPTS) $(SBIN_SCRIPTS) $(LIBEXEC_SCRIPTS)
all: $(BIN_SCRIPTS) $(SBIN_SCRIPTS)
include $(TESTBED_SRCDIR)/GNUmakerules
install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_SCRIPTS)) \
$(addprefix $(INSTALL_SBINDIR)/, $(SBIN_SCRIPTS)) \
$(addprefix $(INSTALL_LIBEXECDIR)/, $(LIBEXEC_SCRIPTS))
$(addprefix $(INSTALL_SBINDIR)/, $(SBIN_SCRIPTS))
#
# Control node installation (okay, plastic)
#
control-install:
cd $(INSTALL_BINDIR) && \
list='$(BIN_SCRIPTS)'; for file in $$list; do \
rm -f $$file; \
ln -s plasticwrap $$file; \
done;
control-install: \
$(addprefix $(INSTALL_BINDIR)/, $(BIN_SCRIPTS))
clean:
......@@ -18,22 +18,11 @@ my $TB = "@prefix@";
# List of allowed commands - Mapping is from command entered by the user
# to the actual binary to run
%allowed = ( "avail" => "$TB/bin/avail",
"inuse" => "$TB/bin/inuse",
"if2port" => "$TB/sbin/if2port",
"mac2if" => "$TB/bin/mac2if",
"nalloc" => "$TB/bin/nalloc",
%allowed = ( "nalloc" => "$TB/bin/nalloc",
"nfree" => "$TB/bin/nfree",
"nodeip" => "$TB/bin/nodeip",
"ns" => "$TB/bin/ns",
"power" => "$TB/bin/power",
"snmpit" => "$TB/bin/snmpit",
"tbprerun" => "$TB/bin/tbprerun",
"tbreport" => "$TB/bin/tbreport",
"tbrun" => "$TB/bin/tbrun",
"tbend" => "$TB/bin/tbend",
"vpower" => "$TB/bin/vpower",
"vsnmpit" => "$TB/bin/vsnmpit");
"node_reboot" => "$TB/bin/node_reboot",
"os_load" => "$TB/bin/os_load",
"snmpit" => "$TB/bin/snmpit");
# Need to provide a simple path, because some scripts we call need one
$ENV{PATH} = "$TB/bin:/bin:/usr/bin:/usr/local/bin";
......
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