Commit 2a1b2451 authored by Mike Hibler's avatar Mike Hibler

Bare minimum to get a client-install to work on Debian 8.

Uses the tmcc/ubuntu15 os-dependant directory, which seems to work.
parent 1f55e391
#
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
# Copyright (c) 2000-2015 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -96,15 +96,16 @@ endif
ifeq ($(MDSUBDIR),redhat9)
MDSUBDIR = linux9
endif
ifeq ($(MDSUBDIR),ubuntu14)
MDSUBDIR = ubuntu14
endif
ifeq ($(MDSUBDIR),Moonshot)
MDSUBDIR = linux-ms
endif
ifeq ($(MDSUBDIR),ubuntu12)
MDSUBDIR = ubuntu11
endif
# XXX lets try this
ifeq ($(MDSUBDIR),debian8)
MDSUBDIR = ubuntu15
endif
ifeq ($(findstring fedora,$(MDSUBDIR)),fedora)
ifeq ($(MDREL),15)
MDSUBDIR = fedora15
......
#!/bin/sh
#
# Copyright (c) 2007-2014 University of Utah and the Flux Group.
# Copyright (c) 2007-2015 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -93,6 +93,16 @@ Linux)
dist=`grep DISTRIB_ID /etc/lsb-release | awk -F = '{ print $2; }'`
rel=`grep DISTRIB_RELEASE /etc/lsb-release | awk -F = '{ print $2; }'`
fi
if [ -z "$dist" -a -r /etc/os-release ]; then
dist=`(. /etc/os-release ; echo $ID)`
if [ "$dist" = "debian" ]; then
trel=`(. /etc/os-release ; echo $VERSION_ID)`
if [ -n "$trel" ]; then
dist="Debian"
rel=$trel
fi
fi
fi
if [ -z "$dist" -a -r /etc/redhat-release ]; then
trel=`grep 'Red Hat' /etc/redhat-release | sed -e 's/Red Hat Linux release \([0-9]\(\.[0-9]\)\?\).*/\1/'`
if [ -n "$trel" ]; then
......
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