From 21ba361db26182b0ad557c8c4869e2c3870e3328 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 24 Oct 2007 15:11:14 +0000 Subject: - bootloader-config: o if drakx-kbd-mouse-x11 is not installed, simply don't add bootsplash instead of dying --- perl-install/NEWS | 5 ++++- perl-install/bootloader.pm | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index dd5f55bf1..087a030c1 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,4 +1,7 @@ -- bootloader-config must not need network::network from libdrakx-net +- bootloader-config: + o bootloader-config must not need network::network from libdrakx-net + o if drakx-kbd-mouse-x11 is not installed, simply don't add bootsplash + instead of dying - fix buttons order under KDE when using compiz (by detecting kde-window-decorator) - drakclock/finish-install: disable DPMS and screensaver when setting time, not to blank monitor (#17031) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index ae99ad69f..2ca5e061e 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -144,7 +144,7 @@ sub add_boot_splash { $vga or return; - require Xconfig::resolution_and_depth; + eval { require Xconfig::resolution_and_depth } or return; if (my $res = Xconfig::resolution_and_depth::from_bios($vga)) { run_program::rooted($::prefix, '/usr/share/bootsplash/scripts/make-boot-splash', $initrd, $res->{X}); } else { -- cgit v1.2.1