Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
44abf290
Commit
44abf290
authored
Jan 18, 2011
by
Leigh B Stoller
Browse files
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
parents
8022c16a
975cc86e
Changes
9
Hide whitespace changes
Inline
Side-by-side
event/proxy/GNUmakefile.in
View file @
44abf290
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-201
0
University of Utah and the Flux Group.
# Copyright (c) 2000-201
1
University of Utah and the Flux Group.
# All rights reserved.
#
...
...
@@ -78,7 +78,11 @@ PLIBS += -ldl -lz
endif
evproxy-debug: evproxy.o $(LIBTBDIR)/log.o
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
$(CC) $(PLDFLAGS) -o $@ -pthread evproxy.o $(PLIBS)
else
$(CC) $(LDFLAGS) -o $@ evproxy.o $(LIBS)
endif
# Dave swears we use this on plab nodes. Hand installed into the rootball.
evproxyplab.o: evproxyplab.cc
...
...
os/frisbee.redux/GNUmakefile.in
View file @
44abf290
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-20
09
University of Utah and the Flux Group.
# Copyright (c) 2000-20
11
University of Utah and the Flux Group.
# All rights reserved.
#
...
...
@@ -100,15 +100,15 @@ endif
#CLIENTLIBS += `elvin-config --libs vin4c`
#EVENTFLAGS = $(CFLAGS) `elvin-config --cflags vin4c` -I$(TESTBED_SRCDIR)
frisbee: $(CLIENTOBJS)
$(CC) $(LDFLAGS) $(CLIENTFLAGS) $(CLIENTOBJS) $(CLIENTLIBS) -o
frisbee
cp frisbee frisbee.debug
strip frisbee
frisbee
-debug
: $(CLIENTOBJS)
$(CC) $(LDFLAGS) $(CLIENTFLAGS) $(CLIENTOBJS) $(CLIENTLIBS) -o
$@
#
cp frisbee frisbee.debug
#
strip frisbee
frisbeed: $(SERVEROBJS)
$(CC) $(LDFLAGS) $(SERVERFLAGS) $(SERVEROBJS) $(SERVERLIBS) -o
frisbeed
cp frisbeed frisbeed.debug
strip frisbeed
frisbeed
-debug
: $(SERVEROBJS)
$(CC) $(LDFLAGS) $(SERVERFLAGS) $(SERVEROBJS) $(SERVERLIBS) -o
$@
#
cp frisbeed frisbeed.debug
#
strip frisbeed
log.o: $(SRCDIR)/log.c decls.h log.h
...
...
os/frisbee.redux/utils.c
View file @
44abf290
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2000-201
0
University of Utah and the Flux Group.
* Copyright (c) 2000-201
1
University of Utah and the Flux Group.
* All rights reserved.
*/
...
...
@@ -16,7 +16,9 @@
#include
<string.h>
#include
<errno.h>
#include
<sys/time.h>
#if !defined(linux) && !defined(__CYGWIN__)
#include
<sys/sysctl.h>
#endif
#include
<assert.h>
#include
"decls.h"
...
...
@@ -61,7 +63,7 @@ sleeptime(unsigned int usecs, char *str, int doround)
int
nusecs
;
if
(
clockres_us
==
0
)
{
#if
n
def
linux
#if
!
def
ined(linux) && !defined(__CYGWIN__)
struct
clockinfo
ci
;
size_t
cisize
=
sizeof
(
ci
);
...
...
os/imagezip/ffs/disklabel.h
View file @
44abf290
...
...
@@ -276,7 +276,7 @@ static const char *fstypenames[] = {
#define D_RAMDISK 0x08
/* disk emulator */
#define D_CHAIN 0x10
/* can do back-back transfers */
#if
n
def
linux
#if
!
def
ined(linux) && !defined(__CYGWIN__)
#include
<sys/ioccom.h>
/*
...
...
tmcd/common/config/rc.config
View file @
44abf290
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2004-20
08
University of Utah and the Flux Group.
# Copyright (c) 2004-20
11
University of Utah and the Flux Group.
# All rights reserved.
#
use
English
;
...
...
@@ -93,8 +93,7 @@ elsif (FAKEJAILED()) {
"rc.ifconfig"
,
"rc.progagent"
);
}
elsif
(
WINDOWS
()) {
@
bootscripts
= (
"rc.misc"
,
"rc.localize"
,
"rc.keys"
,
"rc.mounts"
,
@
bootscripts
= (
"rc.misc"
,
"rc.localize"
,
"rc.keys"
,
"rc.mounts"
,
"rc.accounts"
,
"rc.topomap"
,
"rc.route"
,
"rc.ifconfig"
,
"rc.hostnames"
,
"rc.lmhosts"
,
"rc.syncserver"
,
...
...
tmcd/common/config/rc.mounts
View file @
44abf290
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2004-201
0
University of Utah and the Flux Group.
# Copyright (c) 2004-201
1
University of Utah and the Flux Group.
# All rights reserved.
#
use
English
;
...
...
@@ -546,6 +546,13 @@ sub VMmount()
return
();
}
#
# No VMs on Windows nodes.
#
if
(
WINDOWS
())
{
return
();
}
if
(
$usenfs
)
{
$mountstr
=
$NFSMOUNT
;
}
...
...
tmcd/cygwinxp/GNUmakefile.in
View file @
44abf290
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-20
04, 2007
University of Utah and the Flux Group.
# Copyright (c) 2000-20
11
University of Utah and the Flux Group.
# All rights reserved.
#
...
...
@@ -47,7 +47,7 @@ simple-install: common-install script-install bin-install
dir-install:
baselinux-install: dir-install
(cd ../linux; $(MAKE) client-install)
(cd ../linux; $(MAKE)
DIRGROUP=wheel
client-install)
rm -f $(BINDIR)/rc/rc.healthd
rm -f $(BINDIR)/rc/rc.slothd
...
...
tmcd/linux/GNUmakefile.in
View file @
44abf290
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-201
0
University of Utah and the Flux Group.
# Copyright (c) 2000-201
1
University of Utah and the Flux Group.
# All rights reserved.
#
...
...
@@ -39,6 +39,9 @@ COMMON ?= $(SRCDIR)/../common
DEFRUNLVLDIR ?= $(RCDIR)/rc3.d
ISMFS = $(ETCDIR)/ismfs
# group to use for directories (dir-install)
DIRGROUP ?= root
# without DESTDIR, used for the value of symlinks
RRCDIR ?= /etc/rc.d
...
...
@@ -128,23 +131,23 @@ cdboot-install: destdircheck common-install etc-install \
simple-install: common-install script-install bin-install
dir-install:
$(INSTALL) -m 755 -o root -g
root
-d $(SYSETCDIR)
$(INSTALL) -m 755 -o root -g
root
-d $(SYSETCDIR)/sysconfig
$(INSTALL) -m 755 -o root -g
root
-d $(SYSETCDIR)/sysconfig/network-scripts
$(INSTALL) -m 755 -o root -g
root
-d $(RCDIR)
$(INSTALL) -m 755 -o root -g
root
-d $(RCDIR)/init.d
$(INSTALL) -m 755 -o root -g
root
-d $(RCDIR)/rc1.d
$(INSTALL) -m 755 -o root -g
root
-d $(DEFRUNLVLDIR)
$(INSTALL) -m 755 -o root -g
root
-d $(RCDIR)/rc6.d
$(INSTALL) -m 755 -o root -g
root
-d $(ETCDIR)
$(INSTALL) -m 755 -o root -g
root
-d $(BINDIR)
$(INSTALL) -m 755 -o root -g
root
-d $(RCDIR)
$(INSTALL) -m 755 -o root -g
root
-d $(VARDIR)
$(INSTALL) -m 755 -o root -g
root
-d $(VARDIR)/db
$(INSTALL) -m 755 -o root -g
root
-d $(VARDIR)/jails
$(INSTALL) -m 755 -o root -g
root
-d $(VARDIR)/logs
$(INSTALL) -m 755 -o root -g
root
-d $(VARDIR)/sup
$(INSTALL) -m 755 -o root -g
root
-d $(VARDIR)/boot
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(SYSETCDIR)
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(SYSETCDIR)/sysconfig
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(SYSETCDIR)/sysconfig/network-scripts
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(RCDIR)
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(RCDIR)/init.d
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(RCDIR)/rc1.d
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(DEFRUNLVLDIR)
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(RCDIR)/rc6.d
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(ETCDIR)
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(BINDIR)
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(RCDIR)
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(VARDIR)
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(VARDIR)/db
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(VARDIR)/jails
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(VARDIR)/logs
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(VARDIR)/sup
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(VARDIR)/boot
-rm -rf $(DESTDIR)/etc/testbed
ln -s emulab $(DESTDIR)/etc/testbed
-rm -rf $(DESTDIR)/usr/local/etc/testbed
...
...
@@ -158,7 +161,7 @@ subboss-common-install: dir-install
sup-install: dir-install supfile
$(INSTALL) -m 755 ./supfile $(ETCDIR)/supfile
$(INSTALL) -m 750 -o root -g
root
-d $(DESTDIR)/root/.cvsup
$(INSTALL) -m 750 -o root -g
$(DIRGROUP)
-d $(DESTDIR)/root/.cvsup
$(INSTALL) -m 600 $(SRCDIR)/cvsup.auth $(DESTDIR)/root/.cvsup/auth
bin-install: dir-install
...
...
@@ -187,7 +190,7 @@ sysetc-install: dir-install ifcfgs
$(INSTALL) -m 755 $(SRCDIR)/tbprepare $(RCDIR)/init.d/tbprepare
-ln -sf $(RRCDIR)/init.d/tbprepare $(RCDIR)/rc1.d/K89tbprepare
-ln -sf $(RRCDIR)/init.d/tbprepare $(RCDIR)/rc6.d/K89tbprepare
$(INSTALL) -m 755 -o root -g
root
-d $(SYSETCDIR)/cron.pend
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(SYSETCDIR)/cron.pend
if [ -e $(SYSETCDIR)/cron.daily/slocate.cron ]; then \
mv -f $(SYSETCDIR)/cron.daily/slocate.cron \
$(SYSETCDIR)/cron.pend; \
...
...
@@ -236,7 +239,7 @@ script-install: dir-install $(SCRIPTS)
$(INSTALL) -m 755 $(SRCDIR)/rc.linux $(BINDIR)/rc
sfs-install:
$(INSTALL) -m 755 -o root -g
root
-d $(DESTDIR)/etc/sfs
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(DESTDIR)/etc/sfs
$(INSTALL) -m 755 $(SRCDIR)/sfs.sh $(RCDIR)/init.d/sfs
-ln -sf $(RRCDIR)/init.d/nfs $(DEFRUNLVLDIR)/S20nfs
-ln -sf $(RRCDIR)/init.d/sfs $(RCDIR)/rc6.d/K19sfs
...
...
@@ -253,7 +256,7 @@ ifcfgs: $(SRCDIR)/mkifcfgs $(SRCDIR)/ifcfg.template
$(SRCDIR)/mkifcfgs $(SRCDIR)/ifcfg.template
vserver-install: dir-install
$(INSTALL) -m 755 -o root -g
root
-d $(VSDIR)
$(INSTALL) -m 755 -o root -g
$(DIRGROUP)
-d $(VSDIR)
$(INSTALL) -m 755 $(SRCDIR)/vserver/rc.invserver $(VSDIR)/
$(INSTALL) -m 755 $(SRCDIR)/vserver/vserver-cnet.sh $(VSDIR)/
$(INSTALL) -m 755 $(SRCDIR)/vserver/vserver-init.sh $(VSDIR)/
...
...
tmcd/ubuntu10/GNUmakefile.in
View file @
44abf290
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-20
07, 2009
University of Utah and the Flux Group.
# Copyright (c) 2000-20
11
University of Utah and the Flux Group.
# All rights reserved.
#
...
...
@@ -46,6 +46,7 @@ simple-install: common-install script-install bin-install
dir-install:
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/dhcp3
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/network
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/rsyslog.d
common-install: dir-install
(cd ../common; $(MAKE) DESTDIR=$(DESTDIR) local-install)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment