summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-03-25 16:15:21 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-03-25 16:15:21 +0000
commitbff9df2cb21542c19f6974029e75fceaba56884c (patch)
treeae2425931d6391a53c31bb38db6041d683fcee2d
parent723238c51a08a914f7ae123d0e806a1a10ab266b (diff)
downloaddrakx-bff9df2cb21542c19f6974029e75fceaba56884c.tar
drakx-bff9df2cb21542c19f6974029e75fceaba56884c.tar.gz
drakx-bff9df2cb21542c19f6974029e75fceaba56884c.tar.bz2
drakx-bff9df2cb21542c19f6974029e75fceaba56884c.tar.xz
drakx-bff9df2cb21542c19f6974029e75fceaba56884c.zip
take care of lib64 platforms, also add msboot restorer to x86_64 tree
-rwxr-xr-xrescue/make_rescue_img4
1 files 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");