From bff9df2cb21542c19f6974029e75fceaba56884c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= <gbeauchesne@mandriva.org>
Date: Fri, 25 Mar 2005 16:15:21 +0000
Subject: take care of lib64 platforms, also add msboot restorer to x86_64 tree

---
 rescue/make_rescue_img | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 6b79edcf4..32a5f1417 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -32,7 +32,7 @@ sub install_l {
 
     @l = uniq(map { chomp_($_) } @l);
     push @l, 
-      `ldd @l 2>/dev/null | grep "=>" | perl -pe 's/.*=> //; s/ .*//; s,^/lib/.*?/,/lib/,'`;
+      `ldd @l 2>/dev/null | grep "=>" | perl -pe 's/.*=> //; s/ .*//; s,^/(lib|lib64)/.*?/,/\\1/,'`;
 
     my ($deref, $raw) = partition { /lib.*\.so/ || readlink("/$_") =~ m|/etc/alternatives| } uniq(map { chomp_($_) } @l);
     install_raw(@$raw);
@@ -100,7 +100,7 @@ _ "cp ../kernel/all.kernels/$main/modules.{cz,dep} $tmp/modules";
 installown("drvinst", "/usr/bin");
 installown("guessmounts", "/usr/bin");
 installown("install_bootloader", "/usr/bin");
-if (arch() =~ /^i.86/) {
+if (arch() =~ /^i.86|x86_64/) {
     installown("restore_ms_boot", "/usr/bin");
 }
 installown("lsparts", "/usr/bin");
-- 
cgit v1.2.1