Commit 96417abb authored by Dan Reading's avatar Dan Reading

disable most of centos7 specific files

parent b5ffe2df
......@@ -43,7 +43,7 @@ MYINSTALL = $(SRCDIR)/myinstall
# Force dependencies on the scripts so that they will be rerun through
# configure if the .in file is changed.
#
all: supfile ifcfgs
all: ifcfgs
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -57,7 +57,7 @@ COMMON = $(SRCDIR)/../common
DEFRUNLVLDIR = $(RCDIR)/rc3.d
install client-install: baselinux-client-install common-install etc-install \
sup-install script-install bin-install \
script-install bin-install \
sysetc-onceonly-install
@echo "Remember to install the PEM files if necessary"
......@@ -72,12 +72,12 @@ openvz-install: baselinux-common-install common-install \
baselinux-openvz-install etc-install
dir-install:
# $(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/init.d
# $(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/dhcp
# $(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/logrotate.d
# $(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/systemd
# $(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/systemd/system
@echo "XXX no dir-install: Needed"
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/init.d
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/dhcp
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/logrotate.d
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/systemd
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/systemd/system
@echo "dir-install"
baselinux-%: dir-install
(cd ../linux; $(MAKE) DESTDIR=$(DESTDIR) $(subst baselinux-,,$@))
......@@ -85,19 +85,11 @@ baselinux-%: dir-install
common-install: dir-install
@echo "no centos-specific common files"
sup-install: dir-install
$(INSTALL) -m 755 /dev/null $(ETCDIR)/supfile
@echo "centos-specific sup-install done"
bin-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/emulab-systemd-swaps $(BINDIR)
@echo "no centos-specific bin files"
@echo "centos7 systemd swap.service"
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
$(INSTALL) -m 755 $(SRCDIR)/rc.local $(RCDIR)/rc.local
$(INSTALL) -m 755 $(SRCDIR)/testbed $(RCDIR)/init.d/testbed
@echo "centos-specific etc-install done"
......@@ -105,43 +97,39 @@ etc-install: dir-install sysetc-remove sysetc-install
sysetc-install: ifcfgs dir-install
# Clean up stuff from the base linux install. Ick.
# See ntpd.service below.
# rm -f $(RCDIR)/init.d/ntpd
# rm -f $(DEFRUNLVLDIR)/S58ntpd
# ln -sf /etc/dhclient-enter-hooks $(SYSETCDIR)/dhcp/
# ln -sf /etc/dhclient-exit-hooks $(SYSETCDIR)/dhcp/
# $(INSTALL) -m 644 $(SRCDIR)/ntp.conf $(SYSETCDIR)/ntp.conf
# $(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
# $(INSTALL) -m 644 $(SRCDIR)/logrotate-syslog $(SYSETCDIR)/logrotate.d/syslog
rm -f $(RCDIR)/init.d/ntpd
rm -f $(DEFRUNLVLDIR)/S58ntpd
ln -sf /etc/dhclient-enter-hooks $(SYSETCDIR)/dhcp/
ln -sf /etc/dhclient-exit-hooks $(SYSETCDIR)/dhcp/
$(INSTALL) -m 644 $(SRCDIR)/ntp.conf $(SYSETCDIR)/ntp.conf
$(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
$(INSTALL) -m 644 $(SRCDIR)/logrotate-syslog $(SYSETCDIR)/logrotate.d/syslog
$(INSTALL) -m 644 $(SRCDIR)/emulab-fstab-fixup.service $(SYSETCDIR)/systemd/system
# $(INSTALL) -m 644 $(SRCDIR)/ntpd.service $(SYSETCDIR)/systemd/system
# rm -f $(SYSETCDIR)/systemd/system/multi-user.target.wants/ntpd.service
$(INSTALL) -m 644 $(SRCDIR)/ntpd.service $(SYSETCDIR)/systemd/system
rm -f $(SYSETCDIR)/systemd/system/multi-user.target.wants/ntpd.service
systemctl enable emulab-fstab-fixup.service
# systemctl enable ntpd.service
@echo "XXX sysetc-install commented out"
systemctl enable ntpd.service
sysetc-remove:
# rm -rf $(SYSETCDIR)/modules.conf $(SYSETCDIR)/ntp.conf $(SYSETCDIR)/cron.pend
@echo "XXX sysetc-remove commented out"
rm -rf $(SYSETCDIR)/modules.conf $(SYSETCDIR)/ntp.conf $(SYSETCDIR)/cron.pend
# stuff we don't really need to do all the time and may not even be correct
# or sufficient for all FCs
sysetc-onceonly-install:
# @$(MYINSTALL) $(SRCDIR)/emulab-ld.so.conf $(SYSETCDIR)/ld.so.conf.d/emulab.conf
@$(MYINSTALL) $(SRCDIR)/emulab-ld.so.conf $(SYSETCDIR)/ld.so.conf.d/emulab.conf
@$(MYINSTALL) $(SRCDIR)/network $(SYSETCDIR)/sysconfig/network
# @$(MYINSTALL) $(SRCDIR)/init $(SYSETCDIR)/sysconfig/init
# @$(MYINSTALL) -m 644 $(SRCDIR)/i18n $(SYSETCDIR)/sysconfig/i18n
# @$(MYINSTALL) -m 600 $(SRCDIR)/login.defs $(SYSETCDIR)/login.defs
# @$(MYINSTALL) -m 600 $(SRCDIR)/securetty $(SYSETCDIR)/securetty
@$(MYINSTALL) $(SRCDIR)/init $(SYSETCDIR)/sysconfig/init
@$(MYINSTALL) -m 600 $(SRCDIR)/login.defs $(SYSETCDIR)/login.defs
@$(MYINSTALL) -m 600 $(SRCDIR)/securetty $(SYSETCDIR)/securetty
@$(MYINSTALL) -m 440 $(SRCDIR)/sudoers $(SYSETCDIR)/sudoers
# @$(MYINSTALL) $(SRCDIR)/rsyslog.conf $(SYSETCDIR)/rsyslog.conf
@$(MYINSTALL) $(SRCDIR)/selinux-config $(SYSETCDIR)/selinux/config
@echo "XXX sysetc-onceonly-install commented out"
@echo "sysetc-onceonly-install"
script-install: dir-install $(SCRIPTS)
# $(INSTALL) -m 755 $(SRCDIR)/delaysetup $(BINDIR)/delaysetup
@echo "XXX sysetc-onceonly-install commented out"
$(INSTALL) -m 755 $(SRCDIR)/delaysetup $(BINDIR)/delaysetup
sfs-install:
@echo "no centos-specific sfs files"
......
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