diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-12-18 13:31:12 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-12-18 13:31:12 +0000 |
| commit | 34f87183b7168c5f647b4adb8a16d1158b1594da (patch) | |
| tree | b79247ece0dccd44e18258133c5e4cdfee552a7a | |
| parent | fb9200c7be8ac9c494c022ea8a873ac4f06b496f (diff) | |
| download | drakx-34f87183b7168c5f647b4adb8a16d1158b1594da.tar drakx-34f87183b7168c5f647b4adb8a16d1158b1594da.tar.gz drakx-34f87183b7168c5f647b4adb8a16d1158b1594da.tar.bz2 drakx-34f87183b7168c5f647b4adb8a16d1158b1594da.tar.xz drakx-34f87183b7168c5f647b4adb8a16d1158b1594da.zip | |
- bootloader-config:
o if drakx-kbd-mouse-x11 is not installed, simply don't add bootsplash
instead of dying
(backport from HEAD)
| -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 e7c13284d..6d8360215 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,6 +1,9 @@ - localedrake: o restrict the proposed input-methods for each language -- 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 - localedrake: o do propose "Suisse" after selecting french language (#34675) - draksec: 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 { |