Commit 8fe5086d authored by David Johnson's avatar David Johnson

Add Fedora15 support (forgot the configure/makefile changes!).

parent fb1d08bb
......@@ -4869,6 +4869,7 @@ outfiles="Makeconf GNUmakefile \
tmcc/linux/xen/emulab-cnet \
tmcc/linux9/GNUmakefile tmcc/linux9/supfile \
tmcc/fedora/GNUmakefile tmcc/fedora/supfile \
tmcc/fedora15/GNUmakefile \
tmcc/linux-sg/GNUmakefile tmcc/ubuntu7/GNUmakefile \
tmcc/ubuntu10/GNUmakefile \
tmcc/ubuntu11/GNUmakefile \
......
......@@ -194,6 +194,7 @@ outfiles="Makeconf GNUmakefile \
tmcc/linux/xen/emulab-cnet \
tmcc/linux9/GNUmakefile tmcc/linux9/supfile \
tmcc/fedora/GNUmakefile tmcc/fedora/supfile \
tmcc/fedora15/GNUmakefile \
tmcc/linux-sg/GNUmakefile tmcc/ubuntu7/GNUmakefile \
tmcc/ubuntu10/GNUmakefile \
tmcc/ubuntu11/GNUmakefile \
......
......@@ -63,6 +63,7 @@ endif
# Windows XP -> cygwinxp
#
MDSUBDIR := $(shell $(SRCDIR)/osstuff.sh -t)
MDREL := $(shell $(SRCDIR)/osstuff.sh -r)
ifeq ($(SYSTEM),Linux)
ifeq ($(MDSUBDIR),redhat7)
......@@ -72,8 +73,12 @@ ifeq ($(MDSUBDIR),redhat9)
MDSUBDIR = linux9
endif
ifeq ($(findstring fedora,$(MDSUBDIR)),fedora)
ifeq ($(MDREL),15)
MDSUBDIR = fedora15
else
MDSUBDIR = fedora
endif
endif
ifeq ($(findstring centos,$(MDSUBDIR)),centos)
MDSUBDIR = fedora
endif
......
......@@ -69,6 +69,10 @@ bin-install: dir-install
@echo "no fedora-specific bin files"
etc-install: dir-install sysetc-remove sysetc-install
$(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
@echo "fedora-specific etc-install done"
sysetc-install: ifcfgs dir-install
......@@ -78,6 +82,7 @@ sysetc-install: ifcfgs dir-install
$(INSTALL) -m 755 $(SRCDIR)/ntpd $(SYSETCDIR)/init.d/ntpd
$(INSTALL) -m 644 $(SRCDIR)/ifcfg-eth99 $(SYSETCDIR)/sysconfig/network-scripts
$(INSTALL) -m 644 ifcfg-eth[0-9]* $(SYSETCDIR)/sysconfig/network-scripts
$(INSTALL) -m 744 $(SRCDIR)/ifup-emulabcnet $(SYSETCDIR)/sysconfig/network-scripts
sysetc-remove:
rm -rf $(SYSETCDIR)/modules.conf $(SYSETCDIR)/ntp.conf $(SYSETCDIR)/cron.pend
......
......@@ -7403,6 +7403,7 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/tmcc/linux/xen/emulab-cnet \
clientside/tmcc/linux9/GNUmakefile clientside/tmcc/linux9/supfile \
clientside/tmcc/fedora/GNUmakefile clientside/tmcc/fedora/supfile \
clientside/tmcc/fedora15/GNUmakefile \
clientside/tmcc/linux-sg/GNUmakefile clientside/tmcc/ubuntu7/GNUmakefile \
clientside/tmcc/ubuntu10/GNUmakefile \
clientside/tmcc/ubuntu11/GNUmakefile \
......
......@@ -1124,6 +1124,7 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/tmcc/linux/xen/emulab-cnet \
clientside/tmcc/linux9/GNUmakefile clientside/tmcc/linux9/supfile \
clientside/tmcc/fedora/GNUmakefile clientside/tmcc/fedora/supfile \
clientside/tmcc/fedora15/GNUmakefile \
clientside/tmcc/linux-sg/GNUmakefile clientside/tmcc/ubuntu7/GNUmakefile \
clientside/tmcc/ubuntu10/GNUmakefile \
clientside/tmcc/ubuntu11/GNUmakefile \
......
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