Revision 3536c792
| b/Makefile.am | ||
|---|---|---|
| 661 | 661 |
echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \ |
| 662 | 662 |
echo "NODED_USER = '$(NODED_USER)'"; \ |
| 663 | 663 |
echo "VCS_VERSION = '$$VCSVER'"; \ |
| 664 |
echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \ |
|
| 664 | 665 |
} > $@ |
| 665 | 666 |
|
| 666 | 667 |
$(REPLACE_VARS_SED): Makefile |
| b/configure.ac | ||
|---|---|---|
| 223 | 223 |
fi |
| 224 | 224 |
AC_SUBST(SYSLOG_USAGE, $SYSLOG) |
| 225 | 225 |
|
| 226 |
# --with-disk-separator=... |
|
| 227 |
AC_ARG_WITH([disk-separator], |
|
| 228 |
[AS_HELP_STRING([--with-disk-separator=STRING], |
|
| 229 |
[Disk index separator, useful if the default of ':' is handled specially by the hypervisor] |
|
| 230 |
)], |
|
| 231 |
[disk_separator="$withval"], |
|
| 232 |
[disk_separator=":"]) |
|
| 233 |
AC_SUBST(DISK_SEPARATOR, $disk_separator) |
|
| 234 |
|
|
| 226 | 235 |
# Check common programs |
| 227 | 236 |
AC_PROG_INSTALL |
| 228 | 237 |
AC_PROG_LN_S |
| b/lib/backend.py | ||
|---|---|---|
| 941 | 941 |
|
| 942 | 942 |
|
| 943 | 943 |
def _GetBlockDevSymlinkPath(instance_name, idx): |
| 944 |
return utils.PathJoin(constants.DISK_LINKS_DIR, |
|
| 945 |
"%s:%d" % (instance_name, idx))
|
|
| 944 |
return utils.PathJoin(constants.DISK_LINKS_DIR, "%s%s%d" %
|
|
| 945 |
(instance_name, constants.DISK_SEPARATOR, idx))
|
|
| 946 | 946 |
|
| 947 | 947 |
|
| 948 | 948 |
def _SymlinkBlockDev(instance_name, device_path, idx): |
| b/lib/constants.py | ||
|---|---|---|
| 488 | 488 |
NODE_MAX_CLOCK_SKEW = 150 |
| 489 | 489 |
# Time for an intra-cluster disk transfer to wait for a connection |
| 490 | 490 |
DISK_TRANSFER_CONNECT_TIMEOUT = 30 |
| 491 |
# Disk index separator |
|
| 492 |
DISK_SEPARATOR = _autoconf.DISK_SEPARATOR |
|
| 491 | 493 |
|
| 492 | 494 |
# runparts results |
| 493 | 495 |
(RUNPARTS_SKIP, |
Also available in: Unified diff