summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-19 14:28:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-19 14:28:56 +0000
commit0b243c6d1dd0234af94666d8b0751e1bf487b174 (patch)
tree3bc496aba536bd0f7681800b6028e12bcd979c30
parenta674ecc5364cc2e3dbe8e1924eae70b8ff1c7b92 (diff)
downloaddrakx-0b243c6d1dd0234af94666d8b0751e1bf487b174.tar
drakx-0b243c6d1dd0234af94666d8b0751e1bf487b174.tar.gz
drakx-0b243c6d1dd0234af94666d8b0751e1bf487b174.tar.bz2
drakx-0b243c6d1dd0234af94666d8b0751e1bf487b174.tar.xz
drakx-0b243c6d1dd0234af94666d8b0751e1bf487b174.zip
cleanup sanitize_ver (re-synced with common.pm from bootloader-utils)
-rw-r--r--perl-install/bootloader.pm44
1 files changed, 15 insertions, 29 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 4935c6d17..48acb42da 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -462,39 +462,25 @@ sub get_kernels_and_labels() {
# to catch everything and can be readable if we want to
# add new scheme name.
# DUPLICATED from /usr/share/loader/common.pm
-my $mdksub = "smp|enterprise|secure|linus|mosix|BOOT|custom";
-
sub sanitize_ver {
- my $string = shift;
- my $return;
- my ($ehad, $chtaim, $chaloch, $arba, $hamesh, $chech); #where that names come from ;)
+ my ($string) = @_;
- if ($string =~ m|([^-]+)-([^-]+)(-([^-]+))?(-([^-]*))?|) {
- $ehad = $1; $chtaim = $2; $chaloch = $3; $arba = $4; $hamesh = $5; $chech = $6;
- }
+ my ($main_version, undef, $extraversion, $rest) =
+ $string =~ m!(\d+\.\d+\.\d+)(-((?:pre|rc)\d+))?(.*)!;
- if ($chtaim =~ m|mdk| && $chech =~ m|mdk(${mdksub})|) { #new mdk with mdksub
- my $s = $1;
- $return = "$1$2$3-$4$s" if $chtaim =~ m|^(\d+)\.(\d+)\.(\d+)\.(\d+)mdk|;
- } elsif ($chaloch =~ m|mdk| && $chtaim =~ /pre\d+/
- && $arba =~ m|(\d+)mdk(${mdksub})?|) { #new mdk with mdksub
- my $r = $1;
- my $s = $2 ? $2 : "";
- $return = "$1$2$3-p$4$r$s" if $chtaim =~ m|^(\d+)\.(\d+)\.(\d+)pre(\d+)|;
- } elsif ($chtaim =~ m|mdk$|) { #new mdk
- $return = "$1$2$3-$4" if $chtaim =~ m|^(\d+)\.(\d+)\.(\d+)\.(\d+)mdk$|;
- } elsif ($chaloch =~ m|(\d+)mdk(${mdksub})$|) { #old mdk with mdksub
- my $s = "$1$2";
- $return = "$1$2$3-$s" if $chtaim =~ m|^(\d+)\.(\d+)\.(\d+)|;
- } elsif ($chaloch =~ m|(\d+)mdk$|) { #old mdk
- my $s = $1;
- $return = "$1$2$3-$s" if $chtaim =~ m|^(\d+)\.(\d+)\.(\d+)|;
- } elsif (!defined($chaloch)) { #linus/marcelo vanilla
- $return = "$1$2$3" if $chtaim =~ m|^(\d+)\.(\d+)\.(\d+)$|;
- } else { #a pre ac vanilla or whatever with EXTRAVERSION
- $return = "$1$2$3${chaloch}" if $chtaim =~ m|^(\d+)\.(\d+)\.(\d+)$|;
+ if (my ($mdkver, $cpu, $nproc, $mem) = $rest =~ m|-(.+)-(.+)-(.+)-(.+)|) {
+ $rest = "$cpu$nproc$mem-$mdkver";
}
- $return =~ s|\.||g; $return =~ s|mdk||; $return =~ s|secure|sec|; $return =~ s|enterprise|ent|;
+
+ my $return = "$main_version$extraversion$rest";
+
+ $return =~ s|\.||g;
+ $return =~ s|mdk||;
+ $return =~ s|64GB|64G|;
+ $return =~ s|4GB|4G|;
+ $return =~ s|secure|sec|;
+ $return =~ s|enterprise|ent|;
+
return $return;
}