# (*) otherwise, entering through the root context
# make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
+PLCHOST ?= testplc.onelab.eu
+
ifdef GUEST
-ifdef PLCHOST
SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
-SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
-endif
+SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST) exec
endif
ifdef PLC
SSHURL:=root@$(PLC):/
endif
LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc'
-RSYNC_EXCLUDES := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+RSYNC_EXCLUDES := --exclude .svn --exclude .git --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)
sync:
ifeq (,$(SSHURL))
@echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
- @echo " you can optionnally define DEPLOYMENT too, it defaults to 'regular'"
- @echo " e.g. make sync PLC=boot.onelab.eu DEPLOYMENT=alpha"
- @echo " or make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
+ @echo " e.g. make sync PLC=boot.planetlab.eu"
+ @echo " or make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr"
@exit 1
else
$(SSHCOMMAND) mkdir -p /usr/share/bootmanager/$(DEPLOYMENT)
##########
tags:
- find . -type f | egrep -v '/\.svn/|\.git/|~$$' | xargs etags
+ find . -type f | egrep -v 'TAGS|/\.svn/|\.git/|~$$' | xargs etags
.PHONY: tags
# mkinitrd needs /dev and /proc to do the right thing.
# /proc is already mounted, so bind-mount /dev here
- # looks like this dir somehow already exists under f14
- utils.sysexec_noerr("mount -o bind /dev %s/dev" % SYSIMG_PATH)
+ # xxx tmp - trying to work around the f14 case:
+ # check that /dev/ is mounted with devtmpfs
+ if utils.sysexec_noerr ("grep devtmpfs /proc/mounts") != 0:
+ utils.sysexec("mount -t devtmpfs none /dev")
+ utils.sysexec("mount -o bind /dev %s/dev" % SYSIMG_PATH)
utils.sysexec("mount -t sysfs none %s/sys" % SYSIMG_PATH)
initrd, kernel_version= systeminfo.getKernelVersion(vars,log)