Commit 4a46d589 authored by Mike Hibler's avatar Mike Hibler

Changes for FreeBSD 10.x newnode MFS.

parent e693899b
#!/usr/bin/perl -w
#
# Copyright (c) 2003-2016 University of Utah and the Flux Group.
# Copyright (c) 2003-2017 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -274,10 +274,13 @@ if (!$testing) {
$identifier = 314;
}
print "This node's identifier is: $identifier\n";
if ($writefloppy) {
writefloppy($identifier);
if (defined($identifier)) {
print "This node's identifier is: $identifier\n";
if ($writefloppy) {
writefloppy($identifier);
}
} else {
print "No ID returned by boss, node already exists?\n";
}
#
......
......@@ -180,7 +180,7 @@ frisbee-mfs-install: destdircheck
$(INSTALL) -m 644 $(SRCDIR)/group $(SYSETCDIR); \
fi
mfs-install:
mfs-install: destdircheck
(cd ../freebsd5; $(MAKE) all mfs-install)
rm -f $(SYSETCDIR)/testbed/dhclient
rm -rf $(SYSETCDIR)/rc.conf.d
......@@ -191,6 +191,7 @@ mfs-install:
ln -s /etc/dhclient-enter-hooks $(LETCDIR)/
ln -s /etc/dhclient-exit-hooks $(LETCDIR)/
ln -s /etc/dhclient.conf $(LETCDIR)/
$(INSTALL) -m 644 $(SRCDIR)/mfs-rc.conf $(SYSETCDIR)/rc.conf
$(INSTALL) -m 555 ./netif-emulab $(SYSETCDIR)/rc.d/netif-emulab
@if [ -r $(SRCDIR)/master.passwd ]; then \
$(INSTALL) -m 600 $(SRCDIR)/master.passwd $(SYSETCDIR); \
......@@ -199,3 +200,8 @@ mfs-install:
@if [ -r $(SRCDIR)/group ]; then \
$(INSTALL) -m 644 $(SRCDIR)/group $(SYSETCDIR); \
fi
newnode-mfs-install: mfs-install
(cd ../../tools/teachswitch; $(MAKE) DESTDIR=$(DESTDIR) client-install)
$(INSTALL) -m 755 $(SRCDIR)/../freebsd/newclient $(BINDIR)/newclient
$(INSTALL) -m 755 $(SRCDIR)/mfs-newnode-testbed.sh $(RCDIR)/testbed.sh
#!/bin/sh
#
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
# This file is part of the Emulab network testbed software.
#
# This file is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at
# your option) any later version.
#
# This file is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
# License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
# }}}
#
# PROVIDE: testbed
# REQUIRE: sshd
#
. /etc/emulab/paths.sh
#
# Boottime initialization.
#
case "$1" in
start|faststart)
echo ""
$BINDIR/newclient
;;
stop)
# Foreground mode.
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
;;
esac
exit 0
# Common to both MFSes
sendmail_enable="NONE"
inetd_enable="NO"
ip6addrctl_enable="NO"
newsyslog_enable="NO"
ldconfig_paths=""
ldconfig_paths_aout=""
blanktime="NO"
update_motd="YES"
background_fsck="NO"
sshd_enable="YES"
## Set to YES for debugging
syslogd_enable="NO"
rc_info="NO"
rc_debug="NO"
# Specific to admin MFS
cron_enable="YES"
ntpdate_enable="YES"
ntpdate_flags="boss"
nfs_client_enable="YES"
#
# FreeBSD has no way to say "DHCP on all available interfaces" without
# spelling out here what all those interfaces are. So here we just say
# to (statically) configure the loopback device. The real network
# interfaces are identified in rc.conf.d/dhclient for use by the
# rc.d/dhclient script.
#
network_interfaces="lo0"
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