diff options
| author | Florent Villard <warly@mandriva.com> | 2004-03-19 14:03:14 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2004-03-19 14:03:14 +0000 |
| commit | ffbb24eec81c92f2ef605cadaaed3e91790a2a75 (patch) | |
| tree | cc62baa90a20245172b138d30989d22c0c9110a4 | |
| parent | c608fce46b5875f1371f481215be589a52fbd6ec (diff) | |
| download | bootsplash-ffbb24eec81c92f2ef605cadaaed3e91790a2a75.tar bootsplash-ffbb24eec81c92f2ef605cadaaed3e91790a2a75.tar.gz bootsplash-ffbb24eec81c92f2ef605cadaaed3e91790a2a75.tar.bz2 bootsplash-ffbb24eec81c92f2ef605cadaaed3e91790a2a75.tar.xz bootsplash-ffbb24eec81c92f2ef605cadaaed3e91790a2a75.zip | |
add Olivier Blin fixes to handle symbolic links into detec-resolution
| -rw-r--r-- | bootsplash.spec | 7 | ||||
| -rwxr-xr-x | scripts/detect-resolution | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/bootsplash.spec b/bootsplash.spec index d00dcde..49c1eea 100644 --- a/bootsplash.spec +++ b/bootsplash.spec @@ -1,6 +1,6 @@ %define name bootsplash -%define version 2.1.4 -%define release 2mdk +%define version 2.1.5 +%define release 1mdk %define _bootdir /boot Summary: The Boot Splash Images and scripts @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog +* Fri Mar 19 2004 Warly <warly@mandrakesoft.com> 2.1.5-1mdk +- add Olivier Blin fixes to handle symbolic link into detect-resolution + * Tue Feb 24 2004 Olivier Blin <blino@mandrake.org> 2.1.4-2mdk - DIRM %%{_datadir}/%%{name}/themes - DIRM %%{_sysconfdir}/%%{name}/themes diff --git a/scripts/detect-resolution b/scripts/detect-resolution index 7087665..3021f95 100755 --- a/scripts/detect-resolution +++ b/scripts/detect-resolution @@ -13,7 +13,7 @@ use strict; my (%main, %entry, $vga, $initrd); if ($ARGV[0]) { - $initrd = $ARGV[0]; + $initrd = -l $ARGV[0] ? readlink($ARGV[0]) : $ARGV[0]; $initrd =~ s,.*/,, } else { $vga = detect_from_cmdline(cat_('/proc/cmdline')); @@ -65,6 +65,7 @@ sub parse_grub_conf { $entry{$title}{vga} = $vga if ($title and $vga); } if (m,initrd\s+\(.*\)(?:.*/)?([^\s]+),){ + #- TODO: support links $entry{$title}{initrd} = $1; $main{initrd}{$1} = $entry{$title}{vga} } @@ -83,7 +84,10 @@ sub parse_lilo_conf { $main{vga} = $1 if m/^vga=(.*)/; $vga = $1 if /vga=(.*)/; $label = remove_quotes($1) if /label=(.*)/; - $loc_initrd = $1 if m,initrd=(?:.*/)?(.*),; + if (/initrd=(.*)/) { + $loc_initrd = -l $1 ? readlink($1) : $1; + $loc_initrd =~ s,.*/,,; + } $entry{$label}{vga} = $vga if ($label && $vga); if (/image/) { if ($loc_initrd && $label && $vga) { |