summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-05-30 10:59:04 +0000
committerOlivier Blin <oblin@mandriva.com>2008-05-30 10:59:04 +0000
commit51f1add6904d870ba7aa3ac0cda63bbcd2cc50fb (patch)
tree09d993f2e9ae94efecfed06381e9047ea70bd846
parent3ed535b297c0f7f036d1c5cc6c8cc7ff955192f9 (diff)
downloaddrakx-backup-do-not-use-51f1add6904d870ba7aa3ac0cda63bbcd2cc50fb.tar
drakx-backup-do-not-use-51f1add6904d870ba7aa3ac0cda63bbcd2cc50fb.tar.gz
drakx-backup-do-not-use-51f1add6904d870ba7aa3ac0cda63bbcd2cc50fb.tar.bz2
drakx-backup-do-not-use-51f1add6904d870ba7aa3ac0cda63bbcd2cc50fb.tar.xz
drakx-backup-do-not-use-51f1add6904d870ba7aa3ac0cda63bbcd2cc50fb.zip
service_harddrake: do not allow fbdev if /proc/fb is empty
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/harddrake/autoconf.pm2
2 files changed, 3 insertions, 1 deletions
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;