mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-30 17:18:21 +03:00
conf: Set default global/etc from --with-confdir.
This commit is contained in:
parent
d726246f78
commit
032c9178ca
@ -565,6 +565,9 @@ global {
|
||||
# Defaults to "lvm2".
|
||||
# format = "lvm2"
|
||||
|
||||
# Location of /etc system configuration directory.
|
||||
etc = "@CONFDIR@"
|
||||
|
||||
# Location of proc filesystem
|
||||
proc = "/proc"
|
||||
|
||||
|
5
configure
vendored
5
configure
vendored
@ -12260,6 +12260,11 @@ else
|
||||
fi
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define DEFAULT_ETC_DIR "$CONFDIR"
|
||||
_ACEOF
|
||||
|
||||
|
||||
|
||||
# Check whether --with-staticdir was given.
|
||||
if test "${with_staticdir+set}" = set; then :
|
||||
|
@ -1452,6 +1452,8 @@ AC_ARG_WITH(confdir,
|
||||
AC_HELP_STRING([--with-confdir=DIR],
|
||||
[configuration files in DIR [/etc]]),
|
||||
CONFDIR=$withval, CONFDIR='/etc')
|
||||
AC_DEFINE_UNQUOTED(DEFAULT_ETC_DIR, ["$CONFDIR"],
|
||||
[Default system configuration directory.])
|
||||
|
||||
AC_ARG_WITH(staticdir,
|
||||
AC_HELP_STRING([--with-staticdir=DIR],
|
||||
|
@ -29,7 +29,6 @@
|
||||
|
||||
#define DEFAULT_DEV_DIR "/dev"
|
||||
#define DEFAULT_PROC_DIR "/proc"
|
||||
#define DEFAULT_ETC_DIR "/etc"
|
||||
#define DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV 1
|
||||
#define DEFAULT_EXTERNAL_DEVICE_INFO_SOURCE "none"
|
||||
#define DEFAULT_SYSFS_SCAN 1
|
||||
|
@ -65,6 +65,9 @@
|
||||
/* Default DM run directory. */
|
||||
#undef DEFAULT_DM_RUN_DIR
|
||||
|
||||
/* Default system configuration directory. */
|
||||
#undef DEFAULT_ETC_DIR
|
||||
|
||||
/* Name of default locking directory. */
|
||||
#undef DEFAULT_LOCK_DIR
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user