Commit 28897e93 authored by Leigh B Stoller's avatar Leigh B Stoller

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents eb777b8d ff82e2ca
......@@ -203,8 +203,24 @@ endif
subboss: client
@$(MAKE) -C utils subboss
subboss-install: subboss client-install
subboss-install: subboss
ifeq ($(EVENTSYS),1)
@$(MAKE) -C event client-install
endif
@$(MAKE) -C os client-install
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client-install
@$(MAKE) -C tip client-install
@$(MAKE) -C tools client-install
endif
@$(MAKE) -C sensors client-install
@$(MAKE) -C utils subboss-install
@$(MAKE) -C db subboss-install
@$(MAKE) -C tmcd subboss-install
@$(MAKE) -C rc.d subboss-install
# Hack: this should probably be done by a subboss-install
# script, but there isn't a huge need for that yet
@rm -f $(INSTALL_RCDIR)/isc-dhcpd
TARBALLDESTDIR = /var/tmp/emulab-client
......
......@@ -11,6 +11,8 @@ UNIFIED = @UNIFIED_BOSS_AND_OPS@
include $(OBJDIR)/Makeconf
SUBBOSS_BIN_SCRIPTS = subboss_dhcpd_makeconf
BIN_SCRIPTS = nalloc nfree nodeip readycount subboss_dhcpd_makeconf
SBIN_SCRIPTS = avail inuse showgraph if2port backup webcontrol node_status \
genelists genelists.proxy dhcpd_makeconf nodelog unixgroups \
......@@ -50,6 +52,8 @@ TARGETS = emdb.pm emutil.pm emdbi.pm
SETUID_SBIN_SCRIPTS =
endif
$(SUBBOSS_BIN_SCRIPTS):
#
# Force dependencies on the scripts so that they will be rerun through
# configure if the .in file is changed.
......@@ -64,6 +68,8 @@ else
install: clrhouse-install
endif
subboss-install: $(addprefix $(INSTALL_BINDIR)/, $(SUBBOSS_BIN_SCRIPTS))
boss-install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_SCRIPTS)) \
$(addprefix $(INSTALL_SBINDIR)/, $(SBIN_SCRIPTS)) \
$(addprefix $(INSTALL_LIBDIR)/, $(LIB_SCRIPTS)) \
......
......@@ -175,8 +175,10 @@ if (! $pid) {
$nsfile = $tempdir . "/" . $nsfile;
}
# exec("nice -15 $parser @ARGV $nsfile");
exec("nice -15 $parser @ARGV $nsfile|tee $tempdir/output.txt");
# Piping the output through "|tee" changes the exit status of this
# script so only use for debugging
exec("nice -15 $parser @ARGV $nsfile");
# exec("nice -15 $parser @ARGV $nsfile|tee $tempdir/output.txt");
die("Could not exec the parser!\n");
}
......
......@@ -174,8 +174,7 @@ control-install: tmcc
@$(MAKE) -C freebsd control-install
subboss-install: client
@$(MAKE) -C $(MDSUBDIR) install
@$(MAKE) -C common subboss-install
@$(MAKE) -C $(MDSUBDIR) subboss-install
client-install: client
@$(MAKE) -C $(MDSUBDIR) install
......
......@@ -42,7 +42,7 @@ install client-install:
local-install: path-install local-script-install symlinks
remote-install: path-install remote-script-install
control-install: path-install control-script-install
subboss-install: subboss-script-install
subboss-local-install: path-install subboss-local-script-install symlinks
other-install:
(cd ../../os; $(MAKE) DESTDIR=$(DESTDIR) client-install)
......@@ -85,7 +85,23 @@ common-script-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/startcmddone $(BINDIR)/startcmddone
(cd config; $(MAKE) DESTDIR=$(DESTDIR) script-install)
subboss-script-install: dir-install
subboss-common-script-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/libsetup.pm $(BINDIR)/libsetup.pm
$(INSTALL) -m 755 $(SRCDIR)/libtmcc.pm $(BINDIR)/libtmcc.pm
$(INSTALL) -m 755 $(SRCDIR)/libtestbed.pm $(BINDIR)/libtestbed.pm
$(INSTALL) -m 755 $(SRCDIR)/tmcc.pl $(BINDIR)/tmcc
$(INSTALL) -m 755 $(SRCDIR)/logboot $(BINDIR)/logboot
$(INSTALL) -m 755 $(SRCDIR)/watchdog $(BINDIR)/watchdog
$(INSTALL) -m 755 $(SRCDIR)/ntpstart $(BINDIR)/ntpstart
$(INSTALL) -m 755 $(SRCDIR)/runstartup $(BINDIR)/runstartup
$(INSTALL) -m 755 $(SRCDIR)/runcvsup.sh $(BINDIR)/runcvsup.sh
$(INSTALL) -m 755 $(SRCDIR)/update $(BINDIR)/update
$(INSTALL) -m 755 $(SRCDIR)/ifsetup $(BINDIR)/ifsetup
$(INSTALL) -m 755 $(SRCDIR)/ifdynconfig $(BINDIR)/ifdynconfig
$(INSTALL) -m 755 $(SRCDIR)/vnodesetup $(BINDIR)/vnodesetup
$(INSTALL) -m 755 $(SRCDIR)/bootsubnodes $(BINDIR)/bootsubnodes
$(INSTALL) -m 755 $(SRCDIR)/bootvnodes $(BINDIR)/bootvnodes
$(INSTALL) -m 755 $(SRCDIR)/startcmddone $(BINDIR)/startcmddone
(cd config; $(MAKE) DESTDIR=$(DESTDIR) subboss-script-install)
symlinks: dir-install
......@@ -112,6 +128,20 @@ local-script-install: common-script-install
rm -f $(ETCDIR)/update
-ln -s $(CLIENT_BINDIR)/update $(ETCDIR)/update
subboss-local-script-install: subboss-common-script-install
$(INSTALL) -m 755 $(SRCDIR)/sendevent $(BINDIR)/sendevent
$(INSTALL) -m 755 $(SRCDIR)/rc.testbed $(RCDIR)/rc.testbed
$(INSTALL) -m 755 $(SRCDIR)/rc.bootsetup $(RCDIR)/rc.bootsetup
$(INSTALL) -m 755 $(SRCDIR)/rc.slothd $(RCDIR)/rc.slothd
$(INSTALL) -m 755 $(SRCDIR)/rc.canaryd $(RCDIR)/rc.canaryd
$(INSTALL) -m 755 $(SRCDIR)/rc.linktest $(RCDIR)/rc.linktest
$(INSTALL) -m 755 $(SRCDIR)/rc.inelab $(RCDIR)/rc.inelab
$(INSTALL) -m 755 $(SRCDIR)/rc.pgeni $(RCDIR)/rc.pgeni
# Symlink this cause we invoke it from boss, and its too much
# of a hassle to worry about right now.
rm -f $(ETCDIR)/update
-ln -s $(CLIENT_BINDIR)/update $(ETCDIR)/update
remote-script-install: common-script-install
-chown root $(BINDIR)/vnodesetup
-chmod u+s $(BINDIR)/vnodesetup
......
......@@ -50,6 +50,10 @@ destdircheck:
false; \
fi
subboss-install: subboss-common-install etc-install init-install \
sup-install script-install bin-install jail-install
@echo "Remember to install the PEM files if necessary"
install client-install: common-install etc-install init-install \
sup-install script-install bin-install jail-install
@echo "Remember to install the PEM files if necessary"
......@@ -159,6 +163,9 @@ dir-install:
common-install: dir-install
(cd ../common; $(MAKE) DESTDIR=$(DESTDIR) local-install)
subboss-common-install: dir-install
(cd ../common; $(MAKE) DESTDIR=$(DESTDIR) subboss-local-install)
sup-install: dir-install supfile
$(INSTALL) -m 755 ./supfile $(ETCDIR)/supfile
$(INSTALL) -m 750 -o root -g wheel -d $(DESTDIR)/root/.cvsup
......
......@@ -47,6 +47,9 @@ destdircheck:
false; \
fi
subboss-install: basefbsd-subboss-install etc-install \
sup-install script-install bin-install
install client-install: basefbsd-install etc-install \
sup-install script-install bin-install # jail-install
......@@ -103,6 +106,10 @@ basefbsd-install: dir-install
(cd ../freebsd; $(MAKE) all install)
rm -f $(SYSETCDIR)/start_if.* $(SYSETCDIR)/rc.early $(BINDIR)/dhclient
basefbsd-subboss-install: dir-install
(cd ../freebsd; $(MAKE) all subboss-install)
rm -f $(SYSETCDIR)/start_if.* $(SYSETCDIR)/rc.early $(BINDIR)/dhclient
basefbsdmfs-install: dir-install
(cd ../freebsd; $(MAKE) mfs-install)
rm -f $(SYSETCDIR)/start_if.* $(SYSETCDIR)/rc.early $(BINDIR)/dhclient
......
......@@ -40,6 +40,9 @@ INSTALL = /usr/bin/install -c
install client-install: bincheck basefbsd-install etc-install \
sup-install script-install bin-install
subboss-install: bincheck basefbsd-subboss-install etc-install \
sup-install script-install bin-install
simple-install: script-install bin-install
bincheck:
......@@ -73,6 +76,12 @@ basefbsd-install: dir-install
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
basefbsd-subboss-install: dir-install
(cd ../freebsd5; $(MAKE) all subboss-install)
rm -f $(SYSETCDIR)/rc.conf.d/dhclient
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
sup-install: dir-install supfile
$(INSTALL) -m 755 ./supfile $(ETCDIR)/supfile
......
......@@ -50,6 +50,9 @@ destdircheck:
install client-install: bincheck basefbsd-install etc-install \
sup-install script-install bin-install
subboss-install: bincheck basefbsd-subboss-install etc-install \
sup-install script-install bin-install
simple-install: script-install bin-install
bincheck:
......@@ -83,6 +86,12 @@ basefbsd-install: dir-install
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
basefbsd-subboss-install: dir-install
(cd ../freebsd5; $(MAKE) all subboss-install)
rm -rf $(SYSETCDIR)/rc.conf.d
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
# Do not even pretend to do cvsup anymore
sup-install: dir-install supfile
rm -f $(ETCDIR)/supfile
......
......@@ -52,6 +52,10 @@ destdircheck:
false; \
fi
subboss-install: subboss-common-install etc-install \
sup-install script-install bin-install
@echo "Remember to install the PEM files if necessary"
install client-install: common-install etc-install \
sup-install script-install bin-install vserver-install
@echo "Remember to install the PEM files if necessary"
......@@ -149,6 +153,9 @@ dir-install:
common-install: dir-install
(cd ../common; $(MAKE) DESTDIR=$(DESTDIR) local-install)
subboss-common-install: dir-install
(cd ../common; $(MAKE) DESTDIR=$(DESTDIR) subboss-local-install)
sup-install: dir-install supfile
$(INSTALL) -m 755 ./supfile $(ETCDIR)/supfile
$(INSTALL) -m 750 -o root -g root -d $(DESTDIR)/root/.cvsup
......@@ -215,7 +222,7 @@ script-install: dir-install $(SCRIPTS)
$(INSTALL) -m 755 $(SRCDIR)/chipset.awk $(BINDIR)/chipset.awk
$(INSTALL) -m 755 $(SRCDIR)/cpuspeed.awk $(BINDIR)/cpuspeed.awk
$(INSTALL) -m 755 $(SRCDIR)/rc.mfs $(BINDIR)/rc/rc.mfs
$(INSTALL) -m 755 $(SRCDIR)/control_interface $(BINDIR)/testbed
$(INSTALL) -m 755 $(SRCDIR)/control_interface $(BINDIR)/control_interface
$(INSTALL) -m 755 $(SRCDIR)/rc.frisbee $(BINDIR)/rc/rc.frisbee
$(INSTALL) -m 755 $(SRCDIR)/slicefix $(BINDIR)/slicefix
$(INSTALL) -m 755 $(SRCDIR)/freebsd_to_linux_disk $(BINDIR)/freebsd_to_linux_disk
......@@ -224,8 +231,8 @@ script-install: dir-install $(SCRIPTS)
$(INSTALL) -m 755 $(SRCDIR)/extract_kernel_info $(BINDIR)
$(INSTALL) -m 755 $(SRCDIR)/extract_initrd_info $(BINDIR)
$(INSTALL) -m 755 $(SRCDIR)/extract_image_info $(BINDIR)
$(INSTALL) -m 755 $(SRCDIR)/mount_bsd_slice $(SYSETCDIR)/testbed
$(INSTALL) -m 755 $(SRCDIR)/get_edd_map $(BINDIR)/testbed
$(INSTALL) -m 755 $(SRCDIR)/mount_bsd_slice $(BINDIR)
$(INSTALL) -m 755 $(SRCDIR)/get_edd_map $(BINDIR)
$(INSTALL) -m 755 -s ../findif $(BINDIR)/findif
$(INSTALL) -m 755 $(SRCDIR)/rc.linux $(BINDIR)/rc
......
......@@ -133,15 +133,10 @@ sub os_account_cleanup()
my %PDB;
my %GDB;
my $pretval = dbmopen(%PDB, $PASSDB, undef);
my $gretval = dbmopen(%GDB, $GROUPDB, undef);
if ($pretval) {
dbmopen(%PDB, $PASSDB, 0660) or
die "Cannot open $PASSDB: $!";
}
elsif ($gretval) {
dbmopen(%GDB, $GROUPDB, 0660) or
die "Cannot open $GROUPDB: $!";
}
if ($debug) {
use Data::Dumper;
......
......@@ -39,7 +39,7 @@ my @DEADFILES = ("rc.agents", "rc.delayagent", "rc.delta", "rc.healthd",
"rc.injail", "rc.ipod", "rc.mfs", "rc.progagent",
"rc.setup", "rc.slothd", "rc.testbed",
"batchcmddone", "bootsetup", "install-tarfile",
"jailsetup", "update_delays", "rc/rc.linux",
"jailsetup", "update_delays",
"sethostname" # replaced by sethostname.dhclient on linux
);
......
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