testing for build specific filesystem, which are more important then …

…worker defaults

This makes the usage of BuildFlag: vmfstype:XXX usable again.

build

@@ -332,7 +332,8 @@ Known Parameters:
   --vm-disk-size SIZEINMB
   --vm-swap-size SIZEINMB
   --vm-disk-filesystem TYPE
-              Defaults for automatic setup of VM root/swap files
+              Defaults for automatic setup of VM root/swap files.
+              May get overruled by build config vmfstype build flag.
 
   --vm-memory SIZEINMB
               Set amount of RAM for VMs

build-vm

@@ -603,9 +603,13 @@ vm_detect_2nd_stage() {
 }
 
 vm_set_filesystem_type() {
-    if test -z "$VMDISK_FILESYSTEM" -a -n "$BUILD_DIST" ; then 
-	VMDISK_FILESYSTEM=`queryconfig --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH" buildflags vmfstype`
-    fi   
+    vmfstype=""
+    if test -n "$BUILD_DIST" ; then 
+        # testing for build specific filesystem, which are more important then worker defaults
+        vmfstype=`queryconfig --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH" buildflags vmfstype`
+    fi
+    test -n "$vmfstype" && VMDISK_FILESYSTEM="$vmfstype"
+    # use either commandline specified fs or ext3 as fallback
     test -n "$VMDISK_FILESYSTEM" || VMDISK_FILESYSTEM=ext3
 }