Module: xenomai-3 Branch: next Commit: 65ef2e0825ddc853647175fc767d21872c2cad4c URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=65ef2e0825ddc853647175fc767d21872c2cad4c
Author: Jan Kiszka <jan.kis...@siemens.com> Date: Thu Nov 27 16:47:13 2014 +0100 copperplate/registry: Switch to /var/run as default mountpoint root Creating directories in a user/admin-owned and typically persistent filesystem for the purpose of mounting volatile filesystems on top is a suboptimal default. Today /run should be used for such purposes, but older distros may only expose the current FHS standard /var/run. So use that instead. This comes with the advantage that we will now typically work against tmpfs, thus won't stumble if / is read-only. Signed-off-by: Jan Kiszka <jan.kis...@siemens.com> --- configure | 2 +- configure.ac | 2 +- doc/asciidoc/MIGRATION.adoc | 2 +- doc/asciidoc/README.APPLICATIONS.adoc | 6 +++--- doc/asciidoc/README.INSTALL.adoc | 4 ++-- lib/copperplate/regd/Makefile.in | 25 +++++++++++++++---------- 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 04819c9..ef72f29 100755 --- a/configure +++ b/configure @@ -13097,7 +13097,7 @@ $as_echo_n "checking whether the registry should be enabled... " >&6; } # Check whether --enable-registry was given. if test "${enable_registry+set}" = set; then : enableval=$enable_registry; case "$enableval" in - y | yes) use_registry=y; registry_root=/mnt/xenomai ;; + y | yes) use_registry=y; registry_root=/var/run/xenomai ;; /*) use_registry=y; registry_root=$enableval ;; *) unset use_registry ;; esac diff --git a/configure.ac b/configure.ac index 8627630..c055f83 100644 --- a/configure.ac +++ b/configure.ac @@ -295,7 +295,7 @@ AC_MSG_CHECKING(whether the registry should be enabled) AC_ARG_ENABLE(registry, AS_HELP_STRING([--enable-registry], [Export real-time objects to a registry]), [case "$enableval" in - y | yes) use_registry=y; registry_root=/mnt/xenomai ;; + y | yes) use_registry=y; registry_root=/var/run/xenomai ;; /*) use_registry=y; registry_root=$enableval ;; *) unset use_registry ;; esac]) diff --git a/doc/asciidoc/MIGRATION.adoc b/doc/asciidoc/MIGRATION.adoc index c837925..72206bf 100644 --- a/doc/asciidoc/MIGRATION.adoc +++ b/doc/asciidoc/MIGRATION.adoc @@ -104,7 +104,7 @@ filesystem. The hierarchy of the Xenomai registry is organized as follows: ---------------------------------------------------------------------------- - /mount-point /* registry fs root, defaults to /mnt/xenomai */ + /mount-point /* registry fs root, defaults to /var/run/xenomai*/ /session /* shared session name or "anon" */ /pid /* application (main) pid */ /skin /* API name: alchemy/vxworks/psos/... */ diff --git a/doc/asciidoc/README.APPLICATIONS.adoc b/doc/asciidoc/README.APPLICATIONS.adoc index 6cf353a..f775918 100644 --- a/doc/asciidoc/README.APPLICATIONS.adoc +++ b/doc/asciidoc/README.APPLICATIONS.adoc @@ -72,7 +72,7 @@ link:installing-xenomai-3-x[configuration switch]). *--registry-root=<path>*:: Tells Xenomai to root the object registry at the given path, - instead of +/mnt/xenomai+ by default (see the + instead of +/var/run/xenomai+ by default (see the +--enable-registry+ switch from the configuration options). *--shared-registry*:: @@ -85,7 +85,7 @@ link:installing-xenomai-3-x[configuration switch]). *--no-registry*:: This switch disables registry support at runtime. No real-time - objects will be exported to +/mnt/xenomai/<session>/<pid>+, + objects will be exported to +/var/run/xenomai/<session>/<pid>+, despite the registry code was compiled in. *--no-sanity*:: @@ -118,7 +118,7 @@ link:installing-xenomai-3-x[configuration switch]). [normal] This label is also used to form the registry mount point for - each process, e.g. +/mnt/xenomai/<session>/<pid>+. See + each process, e.g. +/var/run/xenomai/<session>/<pid>+. See +--enable-registry+ from the build options. [normal] diff --git a/doc/asciidoc/README.INSTALL.adoc b/doc/asciidoc/README.INSTALL.adoc index 07cae06..445b0d9 100644 --- a/doc/asciidoc/README.INSTALL.adoc +++ b/doc/asciidoc/README.INSTALL.adoc @@ -413,14 +413,14 @@ Generic configuration options (both cores) [normal] When this option is enabled, the system creates a file - hierachy under `/mnt/xenomai/<session>/<pid>` (by default), + hierachy under `/var/run/xenomai/<session>/<pid>` (by default), where you can access the internal state of the active real-time objects. The session label is obtained from the --session runtime switch. E.g. looking at the properties of a VxWorks task could be done as follows: -------------------------------------------------------------------- - $ cat /mnt/xenomai/anon/12656/vxworks/tasks/windTask + $ cat /var/run/xenomai/anon/12656/vxworks/tasks/windTask name = windTask errno = 0 status = ready diff --git a/lib/copperplate/regd/Makefile.in b/lib/copperplate/regd/Makefile.in index 0c8f28d..693ba0b 100644 --- a/lib/copperplate/regd/Makefile.in +++ b/lib/copperplate/regd/Makefile.in @@ -633,7 +633,8 @@ install-dvi: install-dvi-am install-dvi-am: install-exec-am: install-sbinPROGRAMS - + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook install-html: install-html-am install-html-am: @@ -674,7 +675,7 @@ ps-am: uninstall-am: uninstall-sbinPROGRAMS -.MAKE: install-am install-strip +.MAKE: install-am install-exec-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ clean-libtool clean-sbinPROGRAMS cscopelist-am ctags ctags-am \ @@ -682,14 +683,18 @@ uninstall-am: uninstall-sbinPROGRAMS distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-sbinPROGRAMS install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS - + install-exec-am install-exec-hook install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-sbinPROGRAMS + + +install-exec-hook: + chmod u+s $(DESTDIR)$(sbindir)/sysregd # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git