diff options
| author | Oliver Tappe | 2008-09-03 17:57:40 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2008-09-03 17:57:40 +0200 |
| commit | aab2de05250a2a13d9554ac7d18a8d4631138105 (patch) | |
| tree | 6ea64dd5024d48de418429212fc47a3fdbe4d020 /installer/OpenSLX/OSSetup/Distro/Base.pm | |
| parent | ubuntu-gfx-install.sh: we need /etc-files of ati package (diff) | |
| download | core-aab2de05250a2a13d9554ac7d18a8d4631138105.tar.gz core-aab2de05250a2a13d9554ac7d18a8d4631138105.tar.xz core-aab2de05250a2a13d9554ac7d18a8d4631138105.zip | |
* merged pickKernelFile() from Gentoo.pm into the implementation in Base.pm
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2197 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/OpenSLX/OSSetup/Distro/Base.pm')
| -rw-r--r-- | installer/OpenSLX/OSSetup/Distro/Base.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm index c2db8764..809a625d 100644 --- a/installer/OpenSLX/OSSetup/Distro/Base.pm +++ b/installer/OpenSLX/OSSetup/Distro/Base.pm @@ -215,9 +215,10 @@ sub pickKernelFile my $newestKernelFile; my $newestKernelFileSortKey = ''; - foreach my $kernelFile (glob("$kernelPath/vmlinuz-*")) { + my $kernelPattern = '{vmlinuz,kernel-genkernel-x86}-*'; + foreach my $kernelFile (glob("$kernelPath/$kernelPattern")) { next unless $kernelFile =~ m{ - vmlinuz-(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?-(\d+(?:\.\d+)?) + (?:vmlinuz|x86)-(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?-(\d+(?:\.\d+)?) }x; my $sortKey = sprintf("%02d.%02d.%02d.%02d-%2.1f", $1, $2, $3, $4||0, $5); |