X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=52a7f7a4b4cb4b4c92e0b8732f94ec24ae2b49c7;hb=c3799523252e08ae21389650a7f9c688271d4bc5;hp=12645dace17ddbb65fc9050ebd00aa20fb1bd179;hpb=e7b3c4d7b29b79f79b766c0237c930213ab998a2;p=nodemanager.git

diff --git a/Makefile b/Makefile
index 12645da..52a7f7a 100644
--- a/Makefile
+++ b/Makefile
@@ -35,15 +35,22 @@ 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 -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)/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/
 
+# this now is for the startup of nodemanager itself
 ifneq "$(WITH_SYSTEMD)" ""
 install-startup: install-systemd
 endif
@@ -127,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