diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-10-24 15:11:14 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-10-24 15:11:14 +0000 |
| commit | 21ba361db26182b0ad557c8c4869e2c3870e3328 (patch) | |
| tree | e3227b51311a005c1cbc68ca832462c6d95d1fdf | |
| parent | efad0d7f1e0efb1c7d6f8bb49bd7191ecdb59cd3 (diff) | |
| download | drakx-21ba361db26182b0ad557c8c4869e2c3870e3328.tar drakx-21ba361db26182b0ad557c8c4869e2c3870e3328.tar.gz drakx-21ba361db26182b0ad557c8c4869e2c3870e3328.tar.bz2 drakx-21ba361db26182b0ad557c8c4869e2c3870e3328.tar.xz drakx-21ba361db26182b0ad557c8c4869e2c3870e3328.zip | |
- bootloader-config:
o if drakx-kbd-mouse-x11 is not installed, simply don't add bootsplash
instead of dying
| -rw-r--r-- | perl-install/NEWS | 5 | ||||
| -rw-r--r-- | 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 { |