Revision 4c96e490 common.sh.in

b/common.sh.in
195 195
}
196 196

  
197 197
mkfs_disk0() {
198
    local mkfs="mkfs.${FILESYSTEM}"
198 199
    # Format /
199
    mkfs.ext3 -Fq -L / $root_dev
200
    $mkfs -Fq -L / $root_dev
200 201
    # Format /boot
201 202
    if [ -n "${boot_dev}" ] ; then
202
        mkfs.ext3 -Fq -L /boot $boot_dev
203
        $mkfs -Fq -L /boot $boot_dev
203 204
    fi
204 205
    # Format swap
205 206
    if [ -n "${swap_dev}" ] ; then
......
261 262
}
262 263

  
263 264
setup_fstab() {
264
    local target=$1
265
    local target=$1 fs=${FILESYSTEM}
265 266
    get_os_type $target
266 267
    cat > $target/etc/fstab <<EOF
267 268
# /etc/fstab: static file system information.
268 269
#
269 270
# <file system>   <mount point>   <type>  <options>       <dump>  <pass>
270
UUID=$root_uuid   /               ext3    defaults        0       1
271
UUID=$root_uuid   /               $fs     defaults        0       1
271 272
proc              /proc           proc    defaults        0       0
272 273
EOF
273 274

  
274 275
if [ -n "$boot_dev" -a -n "$boot_uuid" ] ; then
275 276
    cat >> $target/etc/fstab <<EOF
276
UUID=$boot_uuid   /boot           ext3    defaults        1       2
277
UUID=$boot_uuid   /boot           $fs     defaults        1       2
277 278
EOF
278 279
fi
279 280

  
......
364 365
: ${CDINSTALL:="yes"}
365 366
: ${SWAP:="yes"}
366 367
: ${SWAP_SIZE:="${INSTANCE_BE_memory}"}
368
: ${FILESYSTEM:="ext3"}
367 369
: ${IMAGE_NAME:=""}
368 370
: ${IMAGE_TYPE:="qemu"}
369 371
: ${ARCH:=""}

Also available in: Unified diff