summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-06-24 17:38:46 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-06-24 17:49:49 +0200
commitb8ac3a77825a5d742f445f217a6688532f3d0345 (patch)
tree926647f1c742f50718f0c13658130f6199761407 /perl-install
parent4c1cb5006360ccb780926000bd57f150e0fc8fbe (diff)
downloaddrakx-b8ac3a77825a5d742f445f217a6688532f3d0345.tar
drakx-b8ac3a77825a5d742f445f217a6688532f3d0345.tar.gz
drakx-b8ac3a77825a5d742f445f217a6688532f3d0345.tar.bz2
drakx-b8ac3a77825a5d742f445f217a6688532f3d0345.tar.xz
drakx-b8ac3a77825a5d742f445f217a6688532f3d0345.zip
(get_libdir) introduce it
it'll be reused in compssUsers.pl
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/authentication.pm2
-rw-r--r--perl-install/common.pm6
-rw-r--r--perl-install/harddrake/sound.pm2
-rw-r--r--perl-install/install/NEWS3
-rwxr-xr-xperl-install/standalone/service_harddrake2
5 files changed, 11 insertions, 4 deletions
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index 518411a28..65d9950fa 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -47,7 +47,7 @@ my %kind2nsswitch = (
winbind => ['winbind'],
);
-my $lib = (arch() =~ /x86_64/ ? 'lib64' : 'lib');
+my $lib = get_libdir();
my %kind2packages = (
local => [],
diff --git a/perl-install/common.pm b/perl-install/common.pm
index b62893a97..ddffb53f4 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -10,7 +10,7 @@ use run_program;
use Exporter;
our @ISA = qw(Exporter);
-our @EXPORT = qw($SECTORSIZE N P N_ check_for_xserver files_exist formatTime MB formatXiB get_parent_uid is_mgalive is_running is_uefi makedev mageia_release mageia_release_info removeXiBSuffix require_root_capability setVirtual set_alternative set_l10n_sort set_permissions to_utf8 translate unmakedev);
+our @EXPORT = qw($SECTORSIZE N P N_ check_for_xserver files_exist formatTime MB formatXiB get_libdir get_parent_uid is_mgalive is_running is_uefi makedev mageia_release mageia_release_info removeXiBSuffix require_root_capability setVirtual set_alternative set_l10n_sort set_permissions to_utf8 translate unmakedev);
# perl_checker: RE-EXPORT-ALL
push @EXPORT, @MDK::Common::EXPORT;
@@ -713,6 +713,10 @@ sub update_gnomekderc_no_create {
}
}
+sub get_libdir() {
+ arch() =~ /x86_64/ ? "lib64" : "lib";
+}
+
=item is_mgalive()
Checks if we are in mga live mode
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index a173e8984..5ca93d837 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -95,7 +95,7 @@ sub config {
set_pulseaudio($is_pulseaudio_enabled);
set_pulseaudio_glitchfree($is_pulseaudio_glitchfree_enabled);
if ($is_pulseaudio_enabled) {
- my $lib = (arch() =~ /x86_64/ ? 'lib64' : 'lib');
+ my $lib = get_libdir();
$in->do_pkgs->ensure_is_installed($lib . 'alsa-plugins-pulseaudio',
'/usr/' . $lib . '/alsa-lib/libasound_module_pcm_pulse.so');
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index f18a9f67d..ff758bcf9 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- library:
+ o enable compssUsers.pl to pick the right lsb-core-lib(64) flavor
+
Version 17.45 - 24 June 2016
- partionning:
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 5cf319830..96502d22f 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -109,7 +109,7 @@ sub schedule_warn_about_switch {
output('/var/run/harddrake-notify-x11-free-driver-switch', $reason);
}
-my $lib = arch() =~ /x86_64/ ? "lib64" : "lib";
+my $lib = get_libdir();
sub find_xorg_driver {
my ($new_driver) = @_;