From 47342b291c129fd6ef253dd4bb3dd6d2376b0405 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 15 Sep 2009 13:29:50 +0000
Subject: extract MDV::Draklive::Live::get_lib_prefix

---
 lib/MDV/Draklive/Initrd.pm | 4 +---
 lib/MDV/Draklive/Live.pm   | 7 +++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm
index 3bc4713..dcba8d2 100644
--- a/lib/MDV/Draklive/Initrd.pm
+++ b/lib/MDV/Draklive/Initrd.pm
@@ -76,9 +76,7 @@ sub create_media_specific_initrd {
 
     require_list_modules_chroot($live);
 
-    my $lib_prefix = find { glob($root . $_ . '/libc.so.*') } qw(/lib64 /lib);
-    $lib_prefix or die 'unable to find system libraries in /lib or /lib64';
-
+    my $lib_prefix = $live->get_lib_prefix;
     my $initrd_tree = $live->get_builddir . $live->{prefix}{build}{initrd} . '/' . $media->{storage};
     rm_rf($initrd_tree) if -e $initrd_tree;
 
diff --git a/lib/MDV/Draklive/Live.pm b/lib/MDV/Draklive/Live.pm
index c8839c2..0242658 100644
--- a/lib/MDV/Draklive/Live.pm
+++ b/lib/MDV/Draklive/Live.pm
@@ -39,4 +39,11 @@ sub find_kernel {
     $kernel;
 }
 
+sub get_lib_prefix {
+    my ($live) = @_;
+    my $lib_prefix = find { glob($live->get_system_root . $_ . '/libc.so.*') } qw(/lib64 /lib);
+    $lib_prefix or die 'unable to find system libraries in /lib or /lib64';
+    $lib_prefix;
+}
+
 1;
-- 
cgit v1.2.1