Commit 6ebd61ab authored by David Johnson's avatar David Johnson

Updates to Centos7 support for Docker.

parent eff24369
......@@ -2,8 +2,8 @@
set -x
if [ -f /tmp/sources.list.backup ]; then
mv /tmp/sources.list.backup /etc/apt/sources.list
if [ -d /tmp/yum.repos.d ]; then
cp -p /tmp/yum.repos.d/* /etc/yum.repos.d
fi
yum clean all
......
......@@ -4,10 +4,13 @@ set -x
export CENTOS_MIRROR=http://mirror.chpc.utah.edu/pub/centos/
if [ -n "$UBUNTU_MIRROR" -a ! -f /tmp/sources.list.backup ]; then
cp -p /etc/apt/sources.list /tmp/sources.list.backup
sed -i -r -e "s|http://.*.ubuntu.com/ubuntu|$UBUNTU_MIRROR|" \
/etc/apt/sources.list
if [ -n "$CENTOS_MIRROR" -a ! -d /tmp/yum.repos.d ]; then
cp -pR /etc/yum.repos.d /tmp/
repofiles=`ls -1 /etc/yum.repos.d | xargs`
for f in $repofiles ; do
sed -i -e 's/^\(mirrorlist.*\)$/#\1/' /etc/yum.repos.d/$f
sed -i -e "s|^\(.*baseurl.*\)\(\$rel.*\)$|baseurl=$CENTOS_MIRROR\/\2|" /etc/yum.repos.d/$f
done
fi
[ ! -f /tmp/yum-updated ] && yum updateinfo && touch /tmp/yum-updated
......
......@@ -20,14 +20,14 @@ if [ -z "$EMULABSRC" ]; then
echo "WARNING: missing EMULABSRC environment variable pointer to src; cloning!"
export EMULABSRC=/tmp/emulab-devel
cd /tmp
git clone https://gitlab.flux.utah.edu/emulab/emulab-devel $EMULABSRC
git clone https://gitlab.flux.utah.edu/emulab/emulab-devel.git $EMULABSRC
[ ! $? -eq 0 ] && exit 1
fi
if [ -z "$PUBSUBSRC" ]; then
echo "WARNING: missing PUBSUBSRC environment variable pointer to src; cloning!"
export PUBSUBSRC=/tmp/pubsub
cd /tmp
git clone https://gitlab.flux.utah.edu/emulab/pubsub $PUBSUBSRC
git clone https://gitlab.flux.utah.edu/emulab/pubsub.git $PUBSUBSRC
[ ! $? -eq 0 ] && exit 1
fi
......@@ -41,7 +41,7 @@ cp -pRv $PUBSUBSRC/* /tmp/pubsub.obj
cd /tmp
rm -rf /tmp/pubsub.obj
unset CFLAGS
unset CXXFLAGS
#
# If we installed to a DESTDIR, well, we're going to need pubsub dropped
......
......@@ -3,4 +3,4 @@
set -x
yum install -y \
iproute brctl vlan less
iproute bridge-utils less
......@@ -16,7 +16,7 @@ yum -y install rpmdevtools glibc-static which gcc make
cd /tmp
if [ -z "$RUNITSRC" ]; then
yum -y install git
git clone https://gitlab.flux.utah.edu/emulab/runit runit
git clone https://gitlab.flux.utah.edu/emulab/runit.git runit
else
mkdir -p runit
cp -pR $RUNITSRC/* runit
......
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