Revision 494927a8 common.sh.in

b/common.sh.in
187 187
        log_error "Can't find kpartx mapped partition: /dev/mapper/$filesystem_dev_base"
188 188
        exit 1
189 189
    fi
190
    echo "$filesystem_dev"
191
}
192

  
193
map_partition() {
194
    filesystem_dev="$1"
195
    partition="$2"
190 196
    if [ "${SWAP}" = "yes" -a -z "${KERNEL_PATH}" ] ; then
191
        boot_dev="${filesystem_base_dev}-1"
192
        swap_dev="${filesystem_base_dev}-2"
193
        root_dev="${filesystem_base_dev}-3"
197
        boot_dev="${filesystem_dev}-1"
198
        swap_dev="${filesystem_dev}-2"
199
        root_dev="${filesystem_dev}-3"
194 200
    elif [ "${SWAP}" = "no" -a -z "${KERNEL_PATH}" ] ; then
195
        boot_dev="${filesystem_base_dev}-1"
196
        root_dev="${filesystem_base_dev}-2"
201
        boot_dev="${filesystem_dev}-1"
202
        root_dev="${filesystem_dev}-2"
197 203
    elif [ "${SWAP}" = "yes" -a -n "${KERNEL_PATH}" ] ; then
198
        swap_dev="${filesystem_base_dev}-1"
199
        root_dev="${filesystem_base_dev}-2"
204
        swap_dev="${filesystem_dev}-1"
205
        root_dev="${filesystem_dev}-2"
200 206
    elif [ "${SWAP}" = "no" -a -n "${KERNEL_PATH}" ] ; then
201
        root_dev="${filesystem_base_dev}-1"
207
        root_dev="${filesystem_dev}-1"
202 208
    fi
203
    echo "$filesystem_dev"
209
    echo "$(eval "echo \${$(echo ${partition}_dev)"})"
204 210
}
205 211

  
206 212
unmap_disk0() {

Also available in: Unified diff