Revision 6738cd80 common.sh.in

b/common.sh.in
147 147
map_partition() {
148 148
    filesystem_dev="$1"
149 149
    partition="$2"
150
    if [ "${SWAP}" = "yes" -a -z "${KERNEL_PATH}" ] ; then
150
    if [ "${SWAP}" = "yes" -a "${BOOT}" = "yes" ] ; then
151 151
        boot_dev="${filesystem_dev}-1"
152 152
        swap_dev="${filesystem_dev}-2"
153 153
        root_dev="${filesystem_dev}-3"
154
    elif [ "${SWAP}" = "no" -a -z "${KERNEL_PATH}" ] ; then
154
    elif [ "${SWAP}" = "no" -a "${BOOT}" = "yes" ] ; then
155 155
        boot_dev="${filesystem_dev}-1"
156 156
        root_dev="${filesystem_dev}-2"
157
    elif [ "${SWAP}" = "yes" -a -n "${KERNEL_PATH}" ] ; then
157
    elif [ "${SWAP}" = "yes" -a "${BOOT}" = "no" ] ; then
158 158
        swap_dev="${filesystem_dev}-1"
159 159
        root_dev="${filesystem_dev}-2"
160
    elif [ "${SWAP}" = "no" -a -n "${KERNEL_PATH}" ] ; then
160
    elif [ "${SWAP}" = "no" -a "${BOOT}" = "no" ] ; then
161 161
        root_dev="${filesystem_dev}-1"
162 162
    fi
163 163
    echo "$(eval "echo \${$(echo ${partition}_dev)"})"
......
210 210
# only if the user want to specify a mirror in the defaults file we
211 211
# will use it, this declaration is to make sure the variable is set
212 212
: ${CDINSTALL:="no"}
213
: ${BOOT:="no"}
213 214
: ${SWAP:="yes"}
214 215
: ${SWAP_SIZE:="${INSTANCE_BE_memory}"}
215 216
: ${FILESYSTEM:="ext3"}

Also available in: Unified diff