summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2013-07-30 14:17:57 +0200
committerJonathan Bauer2013-07-30 14:17:57 +0200
commit85d4ff8729a0c348e801d5855539a22153fcabf0 (patch)
tree3b623ddd9d196198465ce44ed4f95a3d4a0bd79e
parentonly remove files which could cause problems from /var (diff)
downloadcore-85d4ff8729a0c348e801d5855539a22153fcabf0.tar.gz
core-85d4ff8729a0c348e801d5855539a22153fcabf0.tar.xz
core-85d4ff8729a0c348e801d5855539a22153fcabf0.zip
fix for wrong kernel version check
-rw-r--r--src/installer/OpenSLX/OSSetup/Distro/Base.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/installer/OpenSLX/OSSetup/Distro/Base.pm b/src/installer/OpenSLX/OSSetup/Distro/Base.pm
index f3f35b62..fa0703f5 100644
--- a/src/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/src/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -252,10 +252,10 @@ sub pickKernelFile
my $kernelPattern = '{vmlinuz,kernel-genkernel-x86}-*';
foreach my $kernelFile (glob("$kernelPath/$kernelPattern")) {
next unless $kernelFile =~ m{
- (?:vmlinuz|x86)-(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?-(\d+(?:\.\d+)?)
+ (?:vmlinuz|x86)-(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?-(\d+)(?:\.(\d+))?(?:\.(\d+))?
}x;
my $sortKey
- = sprintf("%02d.%02d.%02d.%02d-%2.1f", $1, $2, $3, $4||0, $5);
+ = sprintf("%02d.%02d.%03d.%03d-%03d.%03d.%03d", $1, $2, $3, $4||0, $5, $6||0, $7||0);
if ($newestKernelFileSortKey lt $sortKey) {
$newestKernelFile = $kernelFile;
$newestKernelFileSortKey = $sortKey;