diff options
-rw-r--r-- | installer/OpenSLX/OSSetup/Distro/Suse.pm | 15 | ||||
-rw-r--r-- | lib/distro-info/suse-10.2/settings.default | 1 | ||||
-rw-r--r-- | lib/distro-info/suse-10.2_x86_64/settings.default | 1 | ||||
-rw-r--r-- | lib/distro-info/suse-10.3/settings.default | 1 | ||||
-rw-r--r-- | lib/distro-info/suse-10.3_x86_64/settings.default | 1 |
5 files changed, 13 insertions, 6 deletions
diff --git a/installer/OpenSLX/OSSetup/Distro/Suse.pm b/installer/OpenSLX/OSSetup/Distro/Suse.pm index 82ab97c5..e41e919a 100644 --- a/installer/OpenSLX/OSSetup/Distro/Suse.pm +++ b/installer/OpenSLX/OSSetup/Distro/Suse.pm @@ -36,8 +36,19 @@ sub initialize my $engine = shift; $self->SUPER::initialize($engine); - $self->{'packager-type'} = 'rpm'; - $self->{'meta-packager-type'} = $ENV{SLX_META_PACKAGER} || 'smart'; + $self->{'packager-type'} = 'rpm'; + + # use 'zypper' as meta-packager from 10.2 onwards and use 'smart' for + # older releases + my $defaultMetaPackager = 'zypper'; + if ($self->{'engine'}->{'distro-name'} =~ m{-([^-]+)$}) { + my $distroVersion = 0.0 + $1; + if ($distroVersion < 10.2) { + $defaultMetaPackager = 'smart'; + } + } + $self->{'meta-packager-type'} + = $ENV{SLX_META_PACKAGER} || $defaultMetaPackager; if ($engine->{'action-type'} eq 'install') { # Inform SUSE RPMs that we're performing an installation - this is diff --git a/lib/distro-info/suse-10.2/settings.default b/lib/distro-info/suse-10.2/settings.default index 5b00c1e8..d808ca38 100644 --- a/lib/distro-info/suse-10.2/settings.default +++ b/lib/distro-info/suse-10.2/settings.default @@ -248,7 +248,6 @@ END scsi sensors sharutils - smart smartmontools smpppd squashfs-kmp-default diff --git a/lib/distro-info/suse-10.2_x86_64/settings.default b/lib/distro-info/suse-10.2_x86_64/settings.default index 190a0a4a..e8e6c68d 100644 --- a/lib/distro-info/suse-10.2_x86_64/settings.default +++ b/lib/distro-info/suse-10.2_x86_64/settings.default @@ -249,7 +249,6 @@ END scsi sensors sharutils - smart smartmontools smpppd squashfs-kmp-default diff --git a/lib/distro-info/suse-10.3/settings.default b/lib/distro-info/suse-10.3/settings.default index ab167235..7217379f 100644 --- a/lib/distro-info/suse-10.3/settings.default +++ b/lib/distro-info/suse-10.3/settings.default @@ -160,7 +160,6 @@ END scsi sensors sharutils - smart smartmontools smpppd squashfs-kmp-default diff --git a/lib/distro-info/suse-10.3_x86_64/settings.default b/lib/distro-info/suse-10.3_x86_64/settings.default index 8752f736..2c46af1f 100644 --- a/lib/distro-info/suse-10.3_x86_64/settings.default +++ b/lib/distro-info/suse-10.3_x86_64/settings.default @@ -160,7 +160,6 @@ END scsi sensors sharutils - smart smartmontools smpppd squashfs-kmp-default |