shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

conf: Set default global/etc from --with-confdir.

Browse Source
This commit is contained in:
Alasdair G Kergon 2015-02-13 19:10:10 +00:00
parent d726246f78
commit 032c9178ca
5 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/example.conf.in
View File

@ -565,6 +565,9 @@ global {
# Defaults to "lvm2". # Defaults to "lvm2".
# format = "lvm2" # format = "lvm2"
# Location of /etc system configuration directory.
etc = "@CONFDIR@"
# Location of proc filesystem # Location of proc filesystem
proc = "/proc" proc = "/proc"

5
configure vendored
View File

@ -12260,6 +12260,11 @@ else
fi fi
cat >>confdefs.h <<_ACEOF
#define DEFAULT_ETC_DIR "$CONFDIR"
_ACEOF
# Check whether --with-staticdir was given. # Check whether --with-staticdir was given.
if test "${with_staticdir+set}" = set; then : if test "${with_staticdir+set}" = set; then :

2
configure.in
View File

@ -1452,6 +1452,8 @@ AC_ARG_WITH(confdir,
AC_HELP_STRING([--with-confdir=DIR], AC_HELP_STRING([--with-confdir=DIR],
[configuration files in DIR [/etc]]), [configuration files in DIR [/etc]]),
CONFDIR=$withval, CONFDIR='/etc') CONFDIR=$withval, CONFDIR='/etc')
AC_DEFINE_UNQUOTED(DEFAULT_ETC_DIR, ["$CONFDIR"],
[Default system configuration directory.])
AC_ARG_WITH(staticdir, AC_ARG_WITH(staticdir,
AC_HELP_STRING([--with-staticdir=DIR], AC_HELP_STRING([--with-staticdir=DIR],

1
lib/config/defaults.h
View File

@ -29,7 +29,6 @@
#define DEFAULT_DEV_DIR "/dev" #define DEFAULT_DEV_DIR "/dev"
#define DEFAULT_PROC_DIR "/proc" #define DEFAULT_PROC_DIR "/proc"
#define DEFAULT_ETC_DIR "/etc"
#define DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV 1 #define DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV 1
#define DEFAULT_EXTERNAL_DEVICE_INFO_SOURCE "none" #define DEFAULT_EXTERNAL_DEVICE_INFO_SOURCE "none"
#define DEFAULT_SYSFS_SCAN 1 #define DEFAULT_SYSFS_SCAN 1

3
lib/misc/configure.h.in
View File

@ -65,6 +65,9 @@
/* Default DM run directory. */ /* Default DM run directory. */
#undef DEFAULT_DM_RUN_DIR #undef DEFAULT_DM_RUN_DIR
/* Default system configuration directory. */
#undef DEFAULT_ETC_DIR
/* Name of default locking directory. */ /* Name of default locking directory. */
#undef DEFAULT_LOCK_DIR #undef DEFAULT_LOCK_DIR