Revision f1b816b7
| b/Makefile.am | ||
|---|---|---|
| 1794 | 1794 |
-DSSH_LOGIN_USER="$(SSH_LOGIN_USER)" \ |
| 1795 | 1795 |
-DSSH_CONSOLE_USER="$(SSH_CONSOLE_USER)" \ |
| 1796 | 1796 |
-DEXPORT_DIR="$(EXPORT_DIR)" \ |
| 1797 |
-DOS_SEARCH_PATH="$(foreach i,$(OS_SEARCH_PATH),\"$(i)\":)" \
|
|
| 1798 |
-DES_SEARCH_PATH="$(foreach i,$(ES_SEARCH_PATH),\"$(i)\":)" \
|
|
| 1797 |
-DOS_SEARCH_PATH="\"$(OS_SEARCH_PATH)\"" \
|
|
| 1798 |
-DES_SEARCH_PATH="\"$(ES_SEARCH_PATH)\"" \
|
|
| 1799 | 1799 |
-DXEN_BOOTLOADER="$(XEN_BOOTLOADER)" \ |
| 1800 | 1800 |
-DXEN_CONFIG_DIR="$(XEN_CONFIG_DIR)" \ |
| 1801 | 1801 |
-DXEN_KERNEL="$(XEN_KERNEL)" \ |
| 1802 | 1802 |
-DXEN_INITRD="$(XEN_INITRD)" \ |
| 1803 | 1803 |
-DKVM_KERNEL="$(KVM_KERNEL)" \ |
| 1804 | 1804 |
-DSHARED_FILE_STORAGE_DIR="$(SHARED_FILE_STORAGE_DIR)" \ |
| 1805 |
-DIALLOCATOR_SEARCH_PATH="$(foreach i,$(IALLOCATOR_SEARCH_PATH),\"$(i)\":)" \
|
|
| 1805 |
-DIALLOCATOR_SEARCH_PATH="\"$(IALLOCATOR_SEARCH_PATH)\"" \
|
|
| 1806 | 1806 |
-DKVM_PATH="$(KVM_PATH)" \ |
| 1807 | 1807 |
-DIP_PATH="$(IP_PATH)" \ |
| 1808 | 1808 |
-DSOCAT_PATH="$(SOCAT)" \ |
| b/configure.ac | ||
|---|---|---|
| 91 | 91 |
AC_SUBST(XEN_CONFIG_DIR, $xen_config_dir) |
| 92 | 92 |
|
| 93 | 93 |
# --with-os-search-path=... |
| 94 |
# do a bit of black sed magic to for quoting of the strings in the list |
|
| 95 | 94 |
AC_ARG_WITH([os-search-path], |
| 96 | 95 |
[AS_HELP_STRING([--with-os-search-path=LIST], |
| 97 | 96 |
[comma separated list of directories to] |
| 98 | 97 |
[ search for OS images (default is /srv/ganeti/os)] |
| 99 | 98 |
)], |
| 100 |
[os_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/\1/g"`],
|
|
| 99 |
[os_search_path="$withval"],
|
|
| 101 | 100 |
[os_search_path="/srv/ganeti/os"]) |
| 102 | 101 |
AC_SUBST(OS_SEARCH_PATH, $os_search_path) |
| 103 | 102 |
|
| 104 | 103 |
# --with-extstorage-search-path=... |
| 105 |
# same black sed magic for quoting of the strings in the list |
|
| 106 | 104 |
AC_ARG_WITH([extstorage-search-path], |
| 107 | 105 |
[AS_HELP_STRING([--with-extstorage-search-path=LIST], |
| 108 | 106 |
[comma separated list of directories to] |
| 109 | 107 |
[ search for External Storage Providers] |
| 110 | 108 |
[ (default is /srv/ganeti/extstorage)] |
| 111 | 109 |
)], |
| 112 |
[es_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/\1/g"`],
|
|
| 110 |
[es_search_path="$withval"],
|
|
| 113 | 111 |
[es_search_path="/srv/ganeti/extstorage"]) |
| 114 | 112 |
AC_SUBST(ES_SEARCH_PATH, $es_search_path) |
| 115 | 113 |
|
| 116 | 114 |
# --with-iallocator-search-path=... |
| 117 |
# do a bit of black sed magic to for quoting of the strings in the list |
|
| 118 | 115 |
AC_ARG_WITH([iallocator-search-path], |
| 119 | 116 |
[AS_HELP_STRING([--with-iallocator-search-path=LIST], |
| 120 | 117 |
[comma separated list of directories to] |
| 121 | 118 |
[ search for instance allocators (default is $libdir/ganeti/iallocators)] |
| 122 | 119 |
)], |
| 123 |
[iallocator_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/\1/g"`],
|
|
| 120 |
[iallocator_search_path="$withval"],
|
|
| 124 | 121 |
[iallocator_search_path="$libdir/$PACKAGE_NAME/iallocators"]) |
| 125 | 122 |
AC_SUBST(IALLOCATOR_SEARCH_PATH, $iallocator_search_path) |
| 126 | 123 |
|
| b/src/AutoConf.hs.in | ||
|---|---|---|
| 28 | 28 |
|
| 29 | 29 |
module AutoConf where |
| 30 | 30 |
|
| 31 |
split :: String -> [String] |
|
| 32 |
split str = |
|
| 33 |
case span (/= ',') str of |
|
| 34 |
(x, []) -> [x] |
|
| 35 |
(x, _:xs) -> x:split xs |
|
| 36 |
|
|
| 31 | 37 |
packageVersion :: String |
| 32 | 38 |
packageVersion = "PACKAGE_VERSION" |
| 33 | 39 |
|
| ... | ... | |
| 68 | 74 |
exportDir = "EXPORT_DIR" |
| 69 | 75 |
|
| 70 | 76 |
osSearchPath :: [String] |
| 71 |
osSearchPath = OS_SEARCH_PATH[]
|
|
| 77 |
osSearchPath = split OS_SEARCH_PATH
|
|
| 72 | 78 |
|
| 73 | 79 |
esSearchPath :: [String] |
| 74 |
esSearchPath = ES_SEARCH_PATH[]
|
|
| 80 |
esSearchPath = split ES_SEARCH_PATH
|
|
| 75 | 81 |
|
| 76 | 82 |
xenBootloader :: String |
| 77 | 83 |
xenBootloader = "XEN_BOOTLOADER" |
| ... | ... | |
| 92 | 98 |
sharedFileStorageDir = "SHARED_FILE_STORAGE_DIR" |
| 93 | 99 |
|
| 94 | 100 |
iallocatorSearchPath :: [String] |
| 95 |
iallocatorSearchPath = IALLOCATOR_SEARCH_PATH[]
|
|
| 101 |
iallocatorSearchPath = split IALLOCATOR_SEARCH_PATH
|
|
| 96 | 102 |
|
| 97 | 103 |
kvmPath :: String |
| 98 | 104 |
kvmPath = "KVM_PATH" |
Also available in: Unified diff