Revision 6738cd80 common_linux.sh

b/common_linux.sh
60 60

  
61 61
linux_format_disk0() {
62 62
    local sfdisk_cmd="$SFDISK -uM -H 255 -S 63 --quiet --Linux --DOS $1"
63
    if [  "${SWAP}" = "yes" -a -z "${KERNEL_PATH}" ] ; then
63
    if [  "${SWAP}" = "yes" -a "${BOOT}" = "yes" ] ; then
64 64
        # Create three partitions:
65 65
        # 1 - 100MB /boot, bootable
66 66
        # 2 - Size of Memory, swap
......
70 70
,${SWAP_SIZE},S
71 71
,,L
72 72
EOF
73
    elif [  "${SWAP}" = "no" -a -z "${KERNEL_PATH}" ] ; then
73
    elif [  "${SWAP}" = "no" -a "${BOOT}" = "yes" ] ; then
74 74
        # Create two partitions:
75 75
        # 1 - 100MB /boot, bootable
76 76
        # 2 - Rest
......
78 78
,100,L,*
79 79
,,L
80 80
EOF
81
    elif [  "${SWAP}" = "yes" -a -n "${KERNEL_PATH}" ] ; then
81
    elif [  "${SWAP}" = "yes" -a "${BOOT}" = "no" ] ; then
82 82
        # Create two partitions:
83 83
        # 1 - Size of Memory, swap
84 84
        # 2 - Rest
......
86 86
,$SWAP_SIZE,S
87 87
,,L
88 88
EOF
89
    elif [  "${SWAP}" = "no" -a -n "${KERNEL_PATH}" ] ; then
89
    elif [  "${SWAP}" = "no" -a "${BOOT}" = "no" ] ; then
90 90
        # Create two partitions:
91 91
        # 1 - Whole
92 92
        $sfdisk_cmd > /dev/null <<EOF

Also available in: Unified diff