Commit d7579349 authored by Mike Hibler's avatar Mike Hibler

Don't do systemctl call if DESTDIR is set.

I want to be able to make a client tarball. Actually, I would prefer that
this call was not here at all or was at least the very last thing in a
client install. When I did a build on CentOS 7, the make hung here everytime
before timing out and leaving me with a partial install.

But I ain't gonna touch it...systemd cooties!
parent 4a2e61ff
#
# Copyright (c) 2000-2015 University of Utah and the Flux Group.
# Copyright (c) 2000-2016 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -77,6 +77,7 @@ dir-install:
$(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
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/systemd/system/multi-user.target.wants
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/dracut.conf.d
@echo "dir-install"
......@@ -107,7 +108,9 @@ sysetc-install: ifcfgs dir-install
$(INSTALL) -m 644 $(SRCDIR)/ntpd.service $(SYSETCDIR)/systemd/system
ln -sf $(SYSETCDIR)/systemd/system/ntpd.service \
$(SYSETCDIR)/systemd/system/multi-user.target.wants/ntpd.service
systemctl daemon-reload
-@if [ -z "$(DESTDIR)" ]; then \
systemctl daemon-reload; \
fi
sysetc-remove:
rm -rf $(SYSETCDIR)/modules.conf $(SYSETCDIR)/ntp.conf $(SYSETCDIR)/cron.pend
......
#
# Copyright (c) 2000-2015 University of Utah and the Flux Group.
# Copyright (c) 2000-2016 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -249,9 +249,11 @@ sysetc-install-systemd:
$(SYSETCDIR)/systemd/system/multi-user.target.wants/testbed.service
ln -sf $(SYSETCDIR)/systemd/system/emulab-fstab-fixup.service \
$(SYSETCDIR)/systemd/system/multi-user.target.wants/emulab-fstab-fixup.service
# Kick the init process to read our newly-installed unit files (i.e., so
# an immediate tbprepare will work...)
systemctl daemon-reload
# Kick the init process to read our newly-installed unit files
# (i.e., so an immediate tbprepare will work...)
-@if [ -z "$(DESTDIR)" ]; then \
systemctl daemon-reload; \
fi
sysetc-remove-systemd:
-rm -f $(RCDIR)/init.d/ntpd
......
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