-# exit for any vm which is not our test vm
-if ifclass VM && ! ifclass demohost || ifclass STABLE_BOOTSTRAP; then
+# exit for any vm except demohost, or if we are doing a dirinstall
+if ifclass VM && ! ifclass demohost || ifclass VOL_STRETCH_BOOTSTRAP || [[ ! $FAI_ACTION || $FAI_ACTION = dirinstall ]]; then