aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2013-01-25 15:04:10 +0000
committerIan Campbell <ian.campbell@citrix.com>2013-01-25 15:04:10 +0000
commit9f7b256146dc5d7fb5aed04b15b82c1da3db4992 (patch)
tree75f2b8b52ffc60228431f07198d8f6847b490d5e /config
parentb59a542f16b073532c7c7a6d4a201706490a346a (diff)
downloadxen-9f7b256146dc5d7fb5aed04b15b82c1da3db4992.tar.gz
tools: revert to using /var and /etc/
26470:acaf29203cf9 "tools+stubdom: install under /usr/local by default" moved more stuff under /usr/local than was desirable. In particular SYSCONFIG_DIR (configuration for initscripts) moved to /usr/local/etc/{sysconfig,defaults} while the initscripts themselves (correctly) remained in /etc/init.d. Moving /etc/xen/scripts breaks the udev bakcned rules file. Lastly stuff under /var was moved to /usr/local/var. Move these back to /etc/ and /var. Moving /etc wholesale rather thsn just the problematic bits is preferable for consistency. Although there seems to be some disagreement about /usr/local/var vs /var using /var is compatible with the FHS and what we think most people will expect. Most of this impacts Linux only but NetBSD appears to have been using /usr/local/var/lib which I have also reset to /var/lib. Note that we already paid no attention to autoconf --sysconfdir or --localstatedir ('etc' and 'var' respectively) so there is no change from that PoV. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Roger Pau Monné <roger.pau@citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'config')
-rw-r--r--config/NetBSD.mk4
-rw-r--r--config/StdGNU.mk7
2 files changed, 0 insertions, 11 deletions
diff --git a/config/NetBSD.mk b/config/NetBSD.mk
index 12c8a349a1..141de7cf34 100644
--- a/config/NetBSD.mk
+++ b/config/NetBSD.mk
@@ -6,10 +6,6 @@ PRIVATE_BINDIR = $(BINDIR)
DLOPEN_LIBS =
-ifeq ($(PREFIX),/usr)
XEN_LOCK_DIR = /var/lib
-else
-XEN_LOCK_DIR = $(PREFIX)/var/lib
-endif
WGET = ftp
diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 3febe8dc28..25fc59413c 100644
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -41,17 +41,10 @@ XENFIRMWAREDIR = $(PREFIX)/lib/xen/boot
PRIVATE_PREFIX = $(LIBDIR)/xen
PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
-ifeq ($(PREFIX),/usr)
CONFIG_DIR = /etc
XEN_LOCK_DIR = /var/lock
XEN_RUN_DIR = /var/run/xen
XEN_PAGING_DIR = /var/lib/xen/xenpaging
-else
-CONFIG_DIR = $(PREFIX)/etc
-XEN_LOCK_DIR = $(PREFIX)/var/lock
-XEN_RUN_DIR = $(PREFIX)/var/run/xen
-XEN_PAGING_DIR = $(PREFIX)/var/lib/xen/xenpaging
-endif
SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR)