From: parmentelat Date: Thu, 13 Dec 2018 15:04:45 +0000 (+0100) Subject: fix 'make sync' X-Git-Tag: myplc-7.0-0~9 X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=3e92c58eed432a011fba73592dd105cba79719d1 fix 'make sync' --- diff --git a/Makefile b/Makefile index ca74d45..dc89c4c 100644 --- a/Makefile +++ b/Makefile @@ -21,9 +21,9 @@ SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME) endif LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc' -RSYNC_EXCLUDES := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES) +RSYNC_EXCLUDES := --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES) RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,) -RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES) +RSYNC := rsync -ai $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES) sync: ifeq (,$(SSHURL)) @@ -33,7 +33,8 @@ ifeq (,$(SSHURL)) @echo " make sync PLCHOSTLXC=.. GUESTNAME=.. GUESTHOSTNAME=.." @exit 1 else - +$(RSYNC) plc.init $(SSHURL)/etc/init.d/plc + +$(RSYNC) systemd/plc-ctl $(SSHURL)/usr/bin/plc-ctl + +$(RSYNC) systemd/plc.service $(SSHURL)/usr/lib/systemd/system/plc.service +$(RSYNC) bin/ $(SSHURL)/usr/bin/ +$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/ +$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/