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
e7f0817d
Commit
e7f0817d
authored
Jan 20, 2004
by
Leigh B. Stoller
Browse files
Banish more deltas stuff.
parent
33e38a61
Changes
8
Hide whitespace changes
Inline
Side-by-side
tmcd/common/GNUmakefile.in
View file @
e7f0817d
...
...
@@ -91,7 +91,6 @@ local-script-install: common-script-install
$(INSTALL) -m 755 $(SRCDIR)/sendevent $(BINDIR)/sendevent
$(INSTALL) -m 755 $(SRCDIR)/rc.testbed $(BINDIR)/rc.testbed
$(INSTALL) -m 755 $(SRCDIR)/rc.agents $(BINDIR)/rc.agents
$(INSTALL) -m 755 $(SRCDIR)/rc.delta $(BINDIR)/rc.delta
$(INSTALL) -m 755 $(SRCDIR)/rc.progagent $(BINDIR)/rc.progagent
$(INSTALL) -m 755 $(SRCDIR)/rc.setup $(BINDIR)/rc.setup
$(INSTALL) -m 755 $(SRCDIR)/rc.slothd $(BINDIR)/rc.slothd
...
...
tmcd/common/libsetup.pm
View file @
e7f0817d
...
...
@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-200
3
University of Utah and the Flux Group.
# Copyright (c) 2000-200
4
University of Utah and the Flux Group.
# All rights reserved.
#
# TODO: Signal handlers for protecting db files.
...
...
@@ -16,7 +16,7 @@ use Exporter;
@EXPORT
=
qw (
libsetup_init
libsetup_setvnodeid
libsetup_settimeout
cleanup_node
doifconfig
dohostnames
domounts
dotunnels
check_nickname
doaccounts
dorpms
dotarballs
dostartupcmd
install_deltas
doaccounts
dorpms
dotarballs
dostartupcmd
bootsetup
nodeupdate
startcmdstatus
whatsmynickname
dosyncserver
TBBackGround
TBForkCmd
vnodejailsetup
plabsetup
vnodeplabsetup
dorouterconfig
jailsetup
dojailconfig
JailedMounts
findiface
...
...
@@ -2923,18 +2923,6 @@ sub startcmdstatus($)
return
(
tmcc
(
TMCCCMD_STARTSTAT
,
"
$status
"));
}
#
# Install deltas is deprecated.
#
sub
install_deltas
()
{
#
# No longer supported, but be sure to return 0.
#
print
"
*** WARNING: No longer supporting testbed deltas!
\n
";
return
0
;
}
#
# Early on in the boot, we want to reset the hostname. This gets the
# nickname and returns it.
...
...
tmcd/common/libtmcc.pm
View file @
e7f0817d
#!/usr/bin/perl -wT
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-200
3
University of Utah and the Flux Group.
# Copyright (c) 2000-200
4
University of Utah and the Flux Group.
# All rights reserved.
#
...
...
@@ -18,7 +18,7 @@ use Exporter;
tmcccopycache
TMCCCMD_REBOOT TMCCCMD_STATUS TMCCCMD_STATE TMCCCMD_IFC
TMCCCMD_ACCT TMCCCMD_DELAY TMCCCMD_HOSTS TMCCCMD_RPM
TMCCCMD_TARBALL TMCCCMD_STARTUP
TMCCCMD_DELTA
TMCCCMD_STARTSTAT
TMCCCMD_TARBALL TMCCCMD_STARTUP TMCCCMD_STARTSTAT
TMCCCMD_READY TMCCCMD_MOUNTS TMCCCMD_ROUTING TMCCCMD_TRAFFIC
TMCCCMD_BOSSINFO TMCCCMD_TUNNEL TMCCCMD_NSECONFIGS
TMCCCMD_VNODELIST TMCCCMD_SUBNODELIST TMCCCMD_ISALIVE
...
...
@@ -120,7 +120,6 @@ my %commandset =
"
rpms
"
=>
{
TAG
=>
"
rpms
"},
"
tarballs
"
=>
{
TAG
=>
"
tarballs
"},
"
startupcmd
"
=>
{
TAG
=>
"
startupcmd
"},
"
deltas
"
=>
{
TAG
=>
"
deltas
"},
"
startstatus
"
=>
{
TAG
=>
"
startstatus
"},
"
ready
"
=>
{
TAG
=>
"
ready
"},
"
mounts
"
=>
{
TAG
=>
"
mounts
"},
...
...
@@ -163,7 +162,6 @@ sub TMCCCMD_HOSTS() { $commandset{"hostnames"}->{TAG}; }
sub
TMCCCMD_RPM
()
{
$commandset
{"
rpms
"}
->
{
TAG
};
}
sub
TMCCCMD_TARBALL
()
{
$commandset
{"
tarballs
"}
->
{
TAG
};
}
sub
TMCCCMD_STARTUP
()
{
$commandset
{"
startupcmd
"}
->
{
TAG
};
}
sub
TMCCCMD_DELTA
()
{
$commandset
{"
deltas
"}
->
{
TAG
};
}
sub
TMCCCMD_STARTSTAT
()
{
$commandset
{"
startstatus
"}
->
{
TAG
};
}
sub
TMCCCMD_READY
()
{
$commandset
{"
ready
"}
->
{
TAG
};
}
sub
TMCCCMD_MOUNTS
()
{
$commandset
{"
mounts
"}
->
{
TAG
};
}
...
...
tmcd/common/rc.delta
deleted
100755 → 0
View file @
33e38a61
#!/usr/bin/perl -wT
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
# All rights reserved.
#
use
English
;
# Drag in path stuff so we can find emulab stuff.
BEGIN
{
require
"
/etc/emulab/paths.pm
";
import
emulabpaths
;
}
#
# Load Deltas.
#
my
$reboot
=
0
;
#
# Turn off line buffering on output
#
$|
=
1
;
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use
libsetup
;
print
STDOUT
"
Checking Testbed Delta configuration ...
\n
";
#
# Delta configuration.
#
$reboot
=
install_deltas
();
if
(
$reboot
)
{
system
("
sync
");
system
("
reboot
");
}
exit
0
;
tmcd/freebsd/prepare
View file @
e7f0817d
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-200
3
University of Utah and the Flux Group.
# Copyright (c) 2000-200
4
University of Utah and the Flux Group.
# All rights reserved.
#
use
English
;
...
...
@@ -15,7 +15,7 @@ BEGIN { require "/etc/emulab/paths.pm"; import emulabpaths; }
# each of the FreeBSD and Linux partitions.
#
my
$DUMPDATES
=
"
/etc/dumpdates
";
my
@DBFILES
=
(
"
/var/db/testbed.deltas
",
"
/var/db/testbed.tarfiles
");
my
@DBFILES
=
("
/var/db/testbed.tarfiles
");
my
@VARDIRS
=
("
logs
",
"
db
",
"
jails
",
"
boot
",
"
lock
");
my
$FSTAB
=
"
/etc/fstab
";
my
$LOGDIR
=
"
/var/log
";
...
...
tmcd/linux/prepare
View file @
e7f0817d
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-200
3
University of Utah and the Flux Group.
# Copyright (c) 2000-200
4
University of Utah and the Flux Group.
# All rights reserved.
#
use
English
;
...
...
@@ -12,7 +12,7 @@ require 'ctime.pl';
# each of the FreeBSD and Linux partitions.
#
my
$DUMPDATES
=
"
/etc/dumpdates
";
my
@DBFILES
=
(
"
/var/db/testbed.deltas
",
"
/var/db/testbed.tarfiles
");
my
@DBFILES
=
("
/var/db/testbed.tarfiles
");
my
@VARDIRS
=
("
logs
",
"
db
",
"
jails
",
"
boot
",
"
lock
");
my
$FSTAB
=
"
/etc/fstab
";
my
$LOGDIR
=
"
/var/log
";
...
...
tmcd/linux/testbed
View file @
e7f0817d
#!/bin/bash
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-200
3
University of Utah and the Flux Group.
# Copyright (c) 2000-200
4
University of Utah and the Flux Group.
# All rights reserved.
#
.
/etc/emulab/paths.sh
...
...
@@ -9,8 +9,7 @@
#
# testbed Do some testbed stuff,
#
# description: Installs deltas (forcing reboot if necessary).
# On shutdown, it informs the testbed we are rebooting
# description: On shutdown, it informs the testbed we are rebooting
# and terminates any lingering daemons.
# Source function library.
...
...
tmcd/tmcd.c
View file @
e7f0817d
...
...
@@ -2387,58 +2387,10 @@ COMMAND_PROTOTYPE(dotarballs)
}
/*
*
Return Deltas stuff
.
*
This is deprecated, but left in case old images reference it
.
*/
COMMAND_PROTOTYPE
(
dodeltas
)
{
MYSQL_RES
*
res
;
MYSQL_ROW
row
;
char
buf
[
MYBUFSIZE
],
*
bp
,
*
sp
;
/*
* Now check reserved table
*/
if
(
!
reqp
->
allocated
)
return
0
;
/*
* Get Delta list for the node.
*/
res
=
mydb_query
(
"select deltas from nodes where node_id='%s' "
,
1
,
reqp
->
nodeid
);
if
(
!
res
)
{
error
(
"DELTAS: %s: DB Error getting Deltas!
\n
"
,
reqp
->
nodeid
);
return
1
;
}
if
((
int
)
mysql_num_rows
(
res
)
==
0
)
{
mysql_free_result
(
res
);
return
0
;
}
/*
* Text string is a colon separated list.
*/
row
=
mysql_fetch_row
(
res
);
if
(
!
row
[
0
]
||
!
row
[
0
][
0
])
{
mysql_free_result
(
res
);
return
0
;
}
bp
=
row
[
0
];
sp
=
bp
;
do
{
bp
=
strsep
(
&
sp
,
":"
);
OUTPUT
(
buf
,
sizeof
(
buf
),
"DELTA=%s
\n
"
,
bp
);
client_writeback
(
sock
,
buf
,
strlen
(
buf
),
tcp
);
if
(
verbose
)
info
(
"DELTAS: %s"
,
buf
);
}
while
((
bp
=
sp
));
mysql_free_result
(
res
);
return
0
;
}
...
...
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