Revision e21b8802 create

b/create
48 48
    fi
49 49

  
50 50
    filesystem_base_dev=$(map_disk0 $blockdev)
51
    root_dev="${filesystem_base_dev}-3"
52
    boot_dev="${filesystem_base_dev}-1"
53
    swap_dev="${filesystem_base_dev}-2"
51
    if [ "${SWAP}" = "yes" ] ; then
52
        boot_dev="${filesystem_base_dev}-1"
53
        swap_dev="${filesystem_base_dev}-2"
54
        root_dev="${filesystem_base_dev}-3"
55
    else
56
        boot_dev="${filesystem_base_dev}-1"
57
        root_dev="${filesystem_base_dev}-2"
58
    fi
54 59
    CLEANUP+=("unmap_disk0 $blockdev")
55 60

  
56 61
    if [ "${IMAGE_TYPE}" = "tarball" ] ; then
......
58 63
        mke2fs -Fjq -L /boot $boot_dev
59 64
        # Format /
60 65
        mke2fs -Fjq -L / $root_dev
61
        # Format swap
62
        mkswap $swap_dev
66
        if [ "${SWAP}" = "yes" ] ; then
67
            # Format swap
68
            mkswap $swap_dev
69
        fi
63 70
    fi
64 71

  
65 72
    TMPDIR=`mktemp -d` || exit 1

Also available in: Unified diff