clean up the code that removes a slice from vsys's scope before its rootfs gets deleted

[nodemanager.git] / Makefile

diff --git a/Makefile b/Makefile
index 694ae92..52a7f7a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,20 +9,9 @@
 # autoconf compatible variables
 datadir := /usr/share
 bindir := /usr/bin
-initdir=/etc/init.d
-systemddir := /usr/lib/systemd/system
-
-####################
 # call with either WITH_SYSTEMD=true or WITH_INIT=true
-ifneq "$(WITH_SYSTEMD)" ""
-use_sytemd=true
-else
-ifneq "$(WITH_INIT)" ""
-use_systemd=""
-else # if not set then try to guess
-use_systemd=$(bash -c 'type -p systemctl')
-endif
-endif
+initdir=/etc/rc.d/init.d
+systemddir := /usr/lib/systemd/system
 
 ####################
 lib: forward_api_calls
@@ -46,18 +35,26 @@ install-lib: install-miscell install-startup
                --install-scripts=$(DESTDIR)/$(bindir)
 
 # might be better in setup.py ?
+# NOTE: the sliver-initscripts/ and sliver-systemd stuff, being, well, for slivers,
+# need to ship on all nodes regardless of WITH_INIT and WITH_SYSTEMD that 
+# impacts how nodemanager itself gets started
 install-miscell:
-       install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
        install -d -m 755 $(DESTDIR)/var/lib/nodemanager
+       install -D -m 644 /dev/null $(DESTDIR)/etc/sysconfig/nodemanager 
+       install -D -m 444 README $(DESTDIR)/$(datadir)/NodeManager/README
        install -D -m 644 logrotate/nodemanager $(DESTDIR)/etc/logrotate.d/nodemanager
-       install -D -m 755 sshsh $(DESTDIR)/bin/sshsh
        mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts
-       rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/sliver-initscripts/
-       chmod 755 $(DESTDIR)/$(datadir)/sliver-initscripts/
+       rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/
+       chmod 755 $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/
+       mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd
+       rsync -av sliver-systemd/ $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd/
+       chmod 755 $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd/
 
-ifneq "$use_systemd" ""
+# this now is for the startup of nodemanager itself
+ifneq "$(WITH_SYSTEMD)" ""
 install-startup: install-systemd
-else
+endif
+ifneq "$(WITH_INIT)" ""
 install-startup: install-init
 endif
 
@@ -137,8 +134,7 @@ else
        @echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
        @echo WARNING : this target might not be very reliable - use with care
        @echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-       +$(RSYNC) --exclude sshsh $(LXC_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
-       +$(RSYNC) ./sshsh $(NODEURL)/bin/
+       +$(RSYNC) $(LXC_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
 #      +$(RSYNC) ./initscripts/ $(NODEURL)/etc/init.d/
        +$(RSYNC) ./systemd/ $(NODEURL)/usr/lib/systemd/system/
 #      ssh -i $(NODE).key.rsa root@$(NODE) service nm restart