From 54521ad1cefc662a7cf35f43ff5ef4994b271afa Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 13 Nov 2009 14:57:02 -0500 Subject: [PATCH] --- yaml --- r: 173079 b: refs/heads/master c: b434a680a29424856e0f40199daa9f65963c7cb4 h: refs/heads/master i: 173077: 396c290ef281631106d2b262dfc1fbbc931166b0 173075: aa67a193c68f32e04cf8df8f6592c248c8d90a45 173071: 8c57fe07a3d6c8db803566f3ca7c8b1466b52e75 v: v3 --- [refs] | 2 +- trunk/drivers/video/console/vgacon.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a8f1ba1daa26..1388b17cad32 100644 --- 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 index 564643edb3c1..cc4bbbe44aca 100644 --- 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)