Revision 6335bfac

b/Makefile.am
8 8
endif
9 9

  
10 10
osdir=$(OS_DIR)/$(OS_NAME)
11
defaultdir=$(DEFAULT_DIR)
11 12
configdir=${sysconfdir}/ganeti/instance-image
12 13
variantsdir=${sysconfdir}/ganeti/instance-image/variants
13 14
networksdir=${sysconfdir}/ganeti/instance-image/networks
......
37 38
	   -e 's|@localstatedir[@]|$(localstatedir)|g' \
38 39
	   -e 's|@osdir[@]|$(osdir)|g' \
39 40
	   -e 's|@osname[@]|$(osname)|g' \
41
	   -e 's|@defaultdir[@]|$(defaultdir)|g' \
40 42
	   -e 's|@AWK[@]|$(AWK)|g' \
41 43
	   -e 's|@MKDIR_P[@]|$(MKDIR_P)|g' \
42 44
	   -e 's|@DUMP[@]|$(DUMP)|g' \
b/common.sh.in
203 203

  
204 204
trap cleanup EXIT
205 205

  
206
DEFAULT_FILE="@DEFAULT_DIR@/ganeti-instance-image"
206
DEFAULT_FILE="@defaultdir@/ganeti-instance-image"
207 207
if [ -f "$DEFAULT_FILE" ]; then
208 208
    . "$DEFAULT_FILE"
209 209
fi

Also available in: Unified diff