Commit 4e18270e authored by Elijah Grubb's avatar Elijah Grubb

Removed unnecessary patches that have been committed to master

parent fdab0e1c
......@@ -27,17 +27,6 @@ if [ -z "$EMULABTMPSRC" ]; then
export EMULABSRC=/tmp/emulab-devel
cd /tmp
git clone https://gitlab.flux.utah.edu/emulab/emulab-devel.git $EMULABSRC
cd $EMULABSRC
cp $DIRNAME/alpine3/noimagezip.patch .
git apply noimagezip.patch
cp $DIRNAME/alpine3/iperf-alpine.patch .
git apply iperf-alpine.patch
cp $DIRNAME/alpine3/delay-agent.patch .
git apply delay-agent.patch
cp $DIRNAME/alpine3/tmcc-alpine-old.patch .
git apply tmcc-alpine-old.patch
cp $DIRNAME/alpine3/libvnode-docker.patch .
git apply libvnode-docker.patch
[ ! $? -eq 0 ] && exit 1
fi
if [ -z "$PUBSUBSRC" ]; then
......
diff --git a/clientside/event/delay-agent/main.h b/clientside/event/delay-agent/main.h
index 0929a31ff..2affb40cc 100644
--- a/clientside/event/delay-agent/main.h
+++ b/clientside/event/delay-agent/main.h
@@ -36,7 +36,6 @@
/* for setsockopt and stuff */
#include <sys/param.h>
#include <sys/socket.h>
-#include <sys/sysctl.h>
#include <sys/time.h>
#include <sys/wait.h>
#ifndef linux
diff --git a/clientside/tmcc/findif.c b/clientside/tmcc/findif.c
index 4e3ac4280..91b422f77 100644
--- a/clientside/tmcc/findif.c
+++ b/clientside/tmcc/findif.c
@@ -71,7 +71,6 @@
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
-#include <sys/sysctl.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <net/ethernet.h>
diff --git a/clientside/tmcc/linux/docker/libvnode_docker.pm b/clientside/tmcc/linux/docker/libvnode_docker.pm
index 4d8d5ef52..e872318ad 100644
--- a/clientside/tmcc/linux/docker/libvnode_docker.pm
+++ b/clientside/tmcc/linux/docker/libvnode_docker.pm
@@ -2735,6 +2735,14 @@ sub vnodeCreate($$$$)
push(@{$args{"HostConfig"}{"Binds"}},$bind);
}
+ if ($newization >= DOCKER_EMULABIZE_CORE()) {
+ my ($boss_name,$boss_ip) = tmccbossinfo();
+ open(FD,">$mntdir/bossnode");
+ print FD "$boss_name\n";
+ close(FD);
+ push(@{$args{"HostConfig"}{"Binds"}},"$mntdir/bossnode:/etc/emulab/bossnode:ro");
+ }
+
#
# Add some Emulab-specific mount points that contain information:
# /var/emulab/boot/{tmcc,tmcc.<vnodeid>}.
diff --git a/clientside/os/GNUmakefile.in b/clientside/os/GNUmakefile.in
index a20822e85..e8819376e 100644
--- a/clientside/os/GNUmakefile.in
+++ b/clientside/os/GNUmakefile.in
@@ -42,6 +42,13 @@ ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
SUBDIRS := $(filter-out imagezip frisbee.redux,$(SUBDIRS))
endif
+ifeq ($(SYSTEM),Linux)
+OSTAG=$(shell $(SRCDIR)/../tmcc/osstuff.sh -t)
+ifeq ($(OSTAG),alpine)
+SUBDIRS := $(filter-out imagezip frisbee.redux capture,$(SUBDIRS))
+endif
+endif
+
all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
@@ -72,10 +79,12 @@ client-install: client
$(MAKE) -C syncd client-install
$(MAKE) -C dijkstra client-install
ifneq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT) # Filter out again...
+ifneq ($(OSTAG),alpine)
$(MAKE) -C imagezip client-install
$(MAKE) -C frisbee.redux client-install
$(MAKE) -C capture client-install
endif
+endif
$(MAKE) -C genhostsfile client-install
ifeq ($(SYSTEM),FreeBSD)
$(MAKE) -C growdisk client-install
diff --git a/clientside/configure b/clientside/configure
index 08894df33..ad9487c2b 100755
--- a/clientside/configure
+++ b/clientside/configure
@@ -4618,6 +4618,7 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/ubuntu16-ms/GNUmakefile \
tmcc/linux-ms/GNUmakefile \
tmcc/archlinux/GNUmakefile \
+ tmcc/alpine/GNUmakefile \
tmcc/freebsd5/GNUmakefile tmcc/freebsd5/supfile \
tmcc/freebsd6/GNUmakefile tmcc/freebsd6/supfile \
tmcc/freebsd6/netif-emulab \
diff --git a/clientside/configure.ac b/clientside/configure.ac
index 2e28806bc..6aaca92c3 100644
--- a/clientside/configure.ac
+++ b/clientside/configure.ac
@@ -306,6 +306,7 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/ubuntu16-ms/GNUmakefile \
tmcc/linux-ms/GNUmakefile \
tmcc/archlinux/GNUmakefile \
+ tmcc/alpine/GNUmakefile \
tmcc/freebsd5/GNUmakefile tmcc/freebsd5/supfile \
tmcc/freebsd6/GNUmakefile tmcc/freebsd6/supfile \
tmcc/freebsd6/netif-emulab \
diff --git a/clientside/tmcc/alpine/GNUmakefile.in b/clientside/tmcc/alpine/GNUmakefile.in
new file mode 100644
index 000000000..75ea5bba5
--- /dev/null
+++ b/clientside/tmcc/alpine/GNUmakefile.in
@@ -0,0 +1,110 @@
+#
+# Copyright (c) 2000-2012, 2015, 2016, 2017 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/>.
+#
+# }}}
+#
+
+#
+# XXX ONLY RUN THIS INSTALL ON AN ALPINE LINUX TESTBED NODE!
+#
+# Trivial. These things just need to be installed into the right place
+# on a testbed node before cutting an image.
+#
+#
+SRCDIR = @srcdir@
+TESTBED_SRCDIR = @top_srcdir@
+OBJDIR = @top_builddir@
+SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
+
+include $(OBJDIR)/Makeconf
+
+SCRIPTS =
+
+#
+# Force dependencies on the scripts so that they will be rerun through
+# configure if the .in file is changed.
+#
+all: supfile ifcfgs
+
+include $(TESTBED_SRCDIR)/GNUmakerules
+
+SYSETCDIR = $(DESTDIR)/etc
+ETCDIR = $(DESTDIR)$(CLIENT_ETCDIR)
+BINDIR = $(DESTDIR)$(CLIENT_BINDIR)
+VARDIR = $(DESTDIR)$(CLIENT_VARDIR)
+RCDIR = $(SYSETCDIR)
+RRCDIR = /etc
+INSTALL = /usr/bin/install -c
+COMMON = $(SRCDIR)/../common
+DEFRUNLVLDIR ?= $(SYSETCDIR)/rc3.d
+# group to use for directories (dir-install)
+DIRGROUP ?= root
+
+install client-install: common-install etc-install \
+ script-install bin-install sysetc-fixup sysetc-install
+ @echo "Remember to install the PEM files if necessary"
+
+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)/sudoers.d
+
+common-install: dir-install
+ (cd ../common; $(MAKE) DESTDIR=$(DESTDIR) local-install)
+
+bin-install: dir-install
+ (cd ../linux; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) USES_SYSTEMD=1 NOPASSWD=1 NOHOSTS=1 bin-install)
+
+etc-install: dir-install common-sysetc-install
+ # No point to having passwd files for a rolling distro!
+ #$(INSTALL) -m 644 $(SRCDIR)/group $(ETCDIR)/group
+ #$(INSTALL) -m 644 $(SRCDIR)/passwd $(ETCDIR)/passwd
+ #$(INSTALL) -m 600 $(SRCDIR)/shadow $(ETCDIR)/shadow
+ #$(INSTALL) -m 600 $(SRCDIR)/gshadow $(ETCDIR)/gshadow
+
+common-sysetc-install: dir-install
+ (cd ../linux; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) RRCDIR=$(RRCDIR) NOPASSWD=1 NOHOSTS=1 sysetc-install)
+
+sysetc-fixup:
+ rm -rf $(SYSETCDIR)/modules.conf $(SYSETCDIR)/cron.pend \
+ $(SYSETCDIR)/sysconfig $(SYSETCDIR)/init.d/ntpd
+ rm -f $(SYSETCDIR)/ntp.drift
+ rm -f $(SYSETCDIR)/rc.local
+
+sysetc-install: dir-install
+ $(INSTALL) -m 644 $(SRCDIR)/sudoers $(SYSETCDIR)/sudoers.d/99-emulab
+ @if [ -z "$(NONTP)" ]; then \
+ $(INSTALL) -m 644 $(SRCDIR)/ntp.conf $(SYSETCDIR)/ntp.conf; \
+ $(INSTALL) -m 644 -o ntp -g ntp /dev/null /var/lib/ntp/ntp.drift ; \
+ fi
+ $(INSTALL) -m 755 -o root -g $(DIRGROUP) -d $(BINDIR)/initscripts
+ # Install our "helper" scripts
+ $(INSTALL) -m 755 -o root -g $(DIRGROUP) \
+ $(SRCDIR)/../linux/tbprepare $(BINDIR)/initscripts/
+ $(INSTALL) -m 755 -o root -g $(DIRGROUP) \
+ $(SRCDIR)/../linux/testbed $(BINDIR)/initscripts/
+
+script-install: dir-install $(SCRIPTS)
+ (cd ../linux; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) NOPASSWD=1 NOHOSTS=1 script-install)
+
+genirack-install:
+
+sfs-install:
diff --git a/clientside/tmcc/alpine/ntp.conf b/clientside/tmcc/alpine/ntp.conf
new file mode 100644
index 000000000..4db6f92a4
--- /dev/null
+++ b/clientside/tmcc/alpine/ntp.conf
@@ -0,0 +1,13 @@
+#
+# Generic Emulab NTP client configuration.
+#
+
+driftfile /var/lib/ntp/ntp.drift
+
+# disallow most accesses, most importantly 'monlist' queries
+# XXX again, not ideal but works with really old ntpds
+restrict default nomodify nopeer noquery notrap
+restrict 127.0.0.1
+restrict ::1
+
+server ntp1 iburst
diff --git a/clientside/tmcc/alpine/sudoers b/clientside/tmcc/alpine/sudoers
new file mode 100644
index 000000000..752628eb9
--- /dev/null
+++ b/clientside/tmcc/alpine/sudoers
@@ -0,0 +1,5 @@
+Defaults !env_reset
+Defaults !mail_badpass
+
+%admin ALL=(ALL) NOPASSWD: ALL
+%root ALL=(ALL) NOPASSWD: ALL
diff --git a/configure b/configure
index 5b755f310..f2e91b69a 100755
--- a/configure
+++ b/configure
@@ -7178,6 +7178,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/tmcc/ubuntu16-ms/GNUmakefile \
clientside/tmcc/linux-ms/GNUmakefile \
clientside/tmcc/archlinux/GNUmakefile \
+ clientside/tmcc/alpine/GNUmakefile \
clientside/tmcc/freebsd5/GNUmakefile clientside/tmcc/freebsd5/supfile \
clientside/tmcc/freebsd6/GNUmakefile clientside/tmcc/freebsd6/supfile \
clientside/tmcc/freebsd6/netif-emulab \
diff --git a/configure.ac b/configure.ac
index 794b4ba3f..5f5392523 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1509,6 +1509,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/tmcc/ubuntu16-ms/GNUmakefile \
clientside/tmcc/linux-ms/GNUmakefile \
clientside/tmcc/archlinux/GNUmakefile \
+ clientside/tmcc/alpine/GNUmakefile \
clientside/tmcc/freebsd5/GNUmakefile clientside/tmcc/freebsd5/supfile \
clientside/tmcc/freebsd6/GNUmakefile clientside/tmcc/freebsd6/supfile \
clientside/tmcc/freebsd6/netif-emulab \
diff --git a/clientside/configure b/clientside/configure
index 08894df33..ad9487c2b 100755
--- a/clientside/configure
+++ b/clientside/configure
@@ -4618,6 +4618,7 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/ubuntu16-ms/GNUmakefile \
tmcc/linux-ms/GNUmakefile \
tmcc/archlinux/GNUmakefile \
+ tmcc/alpine/GNUmakefile \
tmcc/freebsd5/GNUmakefile tmcc/freebsd5/supfile \
tmcc/freebsd6/GNUmakefile tmcc/freebsd6/supfile \
tmcc/freebsd6/netif-emulab \
diff --git a/clientside/configure.ac b/clientside/configure.ac
index 2e28806bc..6aaca92c3 100644
--- a/clientside/configure.ac
+++ b/clientside/configure.ac
@@ -306,6 +306,7 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/ubuntu16-ms/GNUmakefile \
tmcc/linux-ms/GNUmakefile \
tmcc/archlinux/GNUmakefile \
+ tmcc/alpine/GNUmakefile \
tmcc/freebsd5/GNUmakefile tmcc/freebsd5/supfile \
tmcc/freebsd6/GNUmakefile tmcc/freebsd6/supfile \
tmcc/freebsd6/netif-emulab \
diff --git a/configure b/configure
index 5b755f310..f2e91b69a 100755
--- a/configure
+++ b/configure
@@ -7178,6 +7178,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/tmcc/ubuntu16-ms/GNUmakefile \
clientside/tmcc/linux-ms/GNUmakefile \
clientside/tmcc/archlinux/GNUmakefile \
+ clientside/tmcc/alpine/GNUmakefile \
clientside/tmcc/freebsd5/GNUmakefile clientside/tmcc/freebsd5/supfile \
clientside/tmcc/freebsd6/GNUmakefile clientside/tmcc/freebsd6/supfile \
clientside/tmcc/freebsd6/netif-emulab \
diff --git a/configure.ac b/configure.ac
index 794b4ba3f..5f5392523 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1509,6 +1509,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/tmcc/ubuntu16-ms/GNUmakefile \
clientside/tmcc/linux-ms/GNUmakefile \
clientside/tmcc/archlinux/GNUmakefile \
+ clientside/tmcc/alpine/GNUmakefile \
clientside/tmcc/freebsd5/GNUmakefile clientside/tmcc/freebsd5/supfile \
clientside/tmcc/freebsd6/GNUmakefile clientside/tmcc/freebsd6/supfile \
clientside/tmcc/freebsd6/netif-emulab \
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