---

yaml --- r: 173079 b: refs/heads/master c: b434a68 h: refs/heads/master i: 173077: 396c290 173075: aa67a19 173071: 8c57fe0 v: v3
git-mirror · Nov 13, 2009 · 54521ad · 54521ad
1 parent 7ab57cd
commit 54521ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6c06b6807ff9281295989ebad72523865325a4f
+refs/heads/master: b434a680a29424856e0f40199daa9f65963c7cb4
diff --git a/trunk/drivers/video/console/vgacon.c b/trunk/drivers/video/console/vgacon.c
@@ -586,7 +586,10 @@ static void vgacon_init(struct vc_data *c, int init)
 	if (!vgacon_uni_pagedir[0] && p)
 		con_set_default_unimap(c);
 
-	hide_boot_cursor(screen_info.flags & VIDEO_FLAGS_NOCURSOR);
+	/* Only set the default if the user didn't deliberately override it */
+	if (global_cursor_default == -1)
+		global_cursor_default =
+			!(screen_info.flags & VIDEO_FLAGS_NOCURSOR);
 }
 
 static void vgacon_deinit(struct vc_data *c)