Index: branches/zef/i386/libsaio/hfs.c
===================================================================
--- branches/zef/i386/libsaio/hfs.c	(revision 252)
+++ branches/zef/i386/libsaio/hfs.c	(revision 253)
@@ -299,7 +299,7 @@
 	return -1;
     }
 
-    getDeviceStringFromBVR(ih, devStr);
+    getDeviceDescription(ih, devStr);
     verbose("Read HFS%s file: [%s/%s] %d bytes.\n",
             (gIsHFSPlus ? "+" : ""), devStr, filePath, (uint32_t)length);
 	
Index: branches/zef/i386/libsaio/sys.c
===================================================================
--- branches/zef/i386/libsaio/sys.c	(revision 252)
+++ branches/zef/i386/libsaio/sys.c	(revision 253)
@@ -1076,19 +1076,22 @@
     return bvr ? bvr : bvr1;
 }
 
-int getDeviceStringFromBVR(const BVRef bvr, char *str)
+//==========================================================================
+// getDeviceDescription() - Extracts unit number and partition number
+// from bvr structure into "dw(u,p)" format.
+int getDeviceDescription(BVRef bvr, char *str)
 {
 	const struct devsw *dp;
 	
+	*str = '\0';
+
 	if (bvr)
 	{
-		*str = '\0';
+		for (dp = devsw; dp->name && bvr->biosdev >= dp->biosdev; dp++);
+		dp--;
+		if (dp->name) sprintf(str, "%s(%d,%d)", dp->name, bvr->biosdev - dp->biosdev, bvr->part_no);
 		
-	    for (dp = devsw; dp->name && bvr->biosdev >= dp->biosdev; dp++);
-	    dp--;
-	    if (dp->name) sprintf(str, "%s(%d,%d)", dp->name, bvr->biosdev - dp->biosdev, bvr->part_no);
-		
-	    return true;
+		return true;
 	}
 	
 	return false;
Index: branches/zef/i386/libsaio/disk.c
===================================================================
--- branches/zef/i386/libsaio/disk.c	(revision 252)
+++ branches/zef/i386/libsaio/disk.c	(revision 253)
@@ -1707,7 +1707,8 @@
 	
     p = str;
     if (verbose) {
-      sprintf( str, "hd(%d,%d) ", BIOS_DEV_UNIT(bvr), bvr->part_no);
+      getDeviceDescription(bvr, str);
+      strcat(str, " ");
       for (; strMaxLen > 0 && *p != '\0'; p++, strMaxLen--);
     }
 
Index: branches/zef/i386/libsaio/msdos.c
===================================================================
--- branches/zef/i386/libsaio/msdos.c	(revision 252)
+++ branches/zef/i386/libsaio/msdos.c	(revision 253)
@@ -757,7 +757,7 @@
 		toread-=msdosclustersize;
 	}
 	
-  getDeviceStringFromBVR(ih, devStr);
+  getDeviceDescription(ih, devStr);
 	verbose("Read FAT%d file: [%s/%s] %d bytes.\n",
             msdosfatbits, devStr, filePath, (uint32_t)( toread<0 ) ? wastoread : wastoread-toread);
 	free (buf);
Index: branches/zef/i386/libsaio/saio_internal.h
===================================================================
--- branches/zef/i386/libsaio/saio_internal.h	(revision 252)
+++ branches/zef/i386/libsaio/saio_internal.h	(revision 253)
@@ -202,7 +202,7 @@
 extern void   getBootVolumeDescription(BVRef bvr, char *str, long strMaxLen, bool verbose);
 extern void   setRootVolume(BVRef volume);
 extern void   setBootGlobals(BVRef chain);
-extern int    getDeviceStringFromBVR(const BVRef volume, char *str);
+extern int    getDeviceDescription(BVRef volume, char *str);
 
 extern int    gBIOSDev;
 extern int    gBootFileType;
Index: branches/zef/i386/boot2/gui.c
===================================================================
--- branches/zef/i386/boot2/gui.c	(revision 252)
+++ branches/zef/i386/boot2/gui.c	(revision 253)
@@ -87,52 +87,52 @@
 };
 
 image_t images[] = {
-    {.name = "background",                  .image = NULL},
-    {.name = "logo",                        .image = NULL},
-    
-    {.name = "device_generic",              .image = NULL},
-    {.name = "device_generic_o",            .image = NULL},
-    {.name = "device_hfsplus",              .image = NULL},
-    {.name = "device_hfsplus_o",            .image = NULL},
-    {.name = "device_hfsraid",              .image = NULL},
-    {.name = "device_hfsraid_o",            .image = NULL},
-    {.name = "device_ext3",                 .image = NULL},
-    {.name = "device_ext3_o",               .image = NULL},
-    {.name = "device_fat",                .image = NULL},
-    {.name = "device_fat_o",              .image = NULL},
-    {.name = "device_fat16",                .image = NULL},
-    {.name = "device_fat16_o",              .image = NULL},
-    {.name = "device_fat32",                .image = NULL},
-    {.name = "device_fat32_o",              .image = NULL},
-    {.name = "device_ntfs",                 .image = NULL},
-    {.name = "device_ntfs_o",               .image = NULL},
-    {.name = "device_cdrom",                .image = NULL},
-    {.name = "device_cdrom_o",              .image = NULL},
+	{.name = "background",					.image = NULL},
+	{.name = "logo",						.image = NULL},
+	
+	{.name = "device_generic",				.image = NULL},
+	{.name = "device_generic_o",			.image = NULL},
+	{.name = "device_hfsplus",				.image = NULL},
+	{.name = "device_hfsplus_o",			.image = NULL},
+	{.name = "device_hfsraid",				.image = NULL},
+	{.name = "device_hfsraid_o",			.image = NULL},
+	{.name = "device_ext3",					.image = NULL},
+	{.name = "device_ext3_o",				.image = NULL},
+	{.name = "device_fat",					.image = NULL},
+	{.name = "device_fat_o",				.image = NULL},
+	{.name = "device_fat16",				.image = NULL},
+	{.name = "device_fat16_o",				.image = NULL},
+	{.name = "device_fat32",				.image = NULL},
+	{.name = "device_fat32_o",				.image = NULL},
+	{.name = "device_ntfs",					.image = NULL},
+	{.name = "device_ntfs_o",				.image = NULL},
+	{.name = "device_cdrom",				.image = NULL},
+	{.name = "device_cdrom_o",				.image = NULL},
 
-    {.name = "device_selection",            .image = NULL},
-    {.name = "device_scroll_prev",          .image = NULL},
-    {.name = "device_scroll_next",          .image = NULL},
-    
-    {.name = "menu_boot",                   .image = NULL},
-    {.name = "menu_verbose",                .image = NULL},
-    {.name = "menu_ignore_caches",          .image = NULL},
-    {.name = "menu_single_user",            .image = NULL},
-    {.name = "menu_memory_info",            .image = NULL},
-    {.name = "menu_video_info",             .image = NULL},
-    {.name = "menu_help",                   .image = NULL},
-    {.name = "menu_verbose_disabled",       .image = NULL},
-    {.name = "menu_ignore_caches_disabled", .image = NULL},
-    {.name = "menu_single_user_disabled",   .image = NULL},
-    {.name = "menu_selection",              .image = NULL},
-    
-    {.name = "progress_bar",                .image = NULL},
-    {.name = "progress_bar_background",     .image = NULL},
-    
-    {.name = "text_scroll_prev",            .image = NULL},
-    {.name = "text_scroll_next",            .image = NULL},
-    
-    {.name = "font_console",                .image = NULL},
-    {.name = "font_small",                  .image = NULL},
+	{.name = "device_selection",			.image = NULL},
+	{.name = "device_scroll_prev",			.image = NULL},
+	{.name = "device_scroll_next",			.image = NULL},
+	
+	{.name = "menu_boot",					.image = NULL},
+	{.name = "menu_verbose",				.image = NULL},
+	{.name = "menu_ignore_caches",			.image = NULL},
+	{.name = "menu_single_user",			.image = NULL},
+	{.name = "menu_memory_info",			.image = NULL},
+	{.name = "menu_video_info",				.image = NULL},
+	{.name = "menu_help",					.image = NULL},
+	{.name = "menu_verbose_disabled",		.image = NULL},
+	{.name = "menu_ignore_caches_disabled", .image = NULL},
+	{.name = "menu_single_user_disabled",	.image = NULL},
+	{.name = "menu_selection",				.image = NULL},
+	
+	{.name = "progress_bar",				.image = NULL},
+	{.name = "progress_bar_background",		.image = NULL},
+	
+	{.name = "text_scroll_prev",			.image = NULL},
+	{.name = "text_scroll_next",			.image = NULL},
+	
+	{.name = "font_console",				.image = NULL},
+	{.name = "font_small",					.image = NULL},
 };
 
 int imageCnt = 0;
@@ -1811,8 +1811,10 @@
 	// find best matching vesa mode for our requested width & height
 	getGraphicModeParams(screen_params);
 
-	setVideoMode(GRAPHICS_MODE, 0);
-
+	if (bootArgs->Video.v_display == VGA_TEXT_MODE) {
+		setVideoMode(GRAPHICS_MODE, 0);
+	}
+	
 	if (getValueForKey("-checkers", &dummyVal, &length, &bootInfo->bootConfig)) {
 		drawCheckerBoard();
 	} else {