From 51f1add6904d870ba7aa3ac0cda63bbcd2cc50fb Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 30 May 2008 10:59:04 +0000 Subject: service_harddrake: do not allow fbdev if /proc/fb is empty --- perl-install/NEWS | 2 ++ perl-install/harddrake/autoconf.pm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 9c987c988..933fddcdd 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,7 @@ - allow mounting ntfs-3g partitions (also fixes detection of Windows partitions during live installation) +- service_harddrake: + o do not allow fbdev if /proc/fb is empty Version 10.33 - 29 May 2008 diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm index 791185b67..98be5d878 100644 --- a/perl-install/harddrake/autoconf.pm +++ b/perl-install/harddrake/autoconf.pm @@ -13,7 +13,7 @@ sub xconf { $o->{raw_X} = Xconfig::default::configure($do_pkgs); require Xconfig::main; - Xconfig::main::configure_everything_auto_install($o->{raw_X}, $do_pkgs, {}, { allowFB => 1 }); + Xconfig::main::configure_everything_auto_install($o->{raw_X}, $do_pkgs, {}, { allowFB => listlength(cat_("/proc/fb")) }); #- always disable compositing desktop effects when configuring a new video card require Xconfig::glx; -- cgit v1.2.1