summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2002-08-01 09:44:47 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2002-08-01 09:44:47 +0000
commit07cf31e3b0131c9ae94c3427c1ab35cf4508cb61 (patch)
tree180b3f1c96d73d26cb47549ba6f7475050d84b3c
parent774ceaaa0bddccbc7bfaa41da08e3f0e934789da (diff)
downloaddrakx-07cf31e3b0131c9ae94c3427c1ab35cf4508cb61.tar
drakx-07cf31e3b0131c9ae94c3427c1ab35cf4508cb61.tar.gz
drakx-07cf31e3b0131c9ae94c3427c1ab35cf4508cb61.tar.bz2
drakx-07cf31e3b0131c9ae94c3427c1ab35cf4508cb61.tar.xz
drakx-07cf31e3b0131c9ae94c3427c1ab35cf4508cb61.zip
- MDK::Common'ize for arch() support
- Don't grab /lib/i686/ libraries - Update list to use LIB which expands to either lib64 or lib
-rw-r--r--rescue/list26
-rwxr-xr-xrescue/make_rescue_img13
2 files changed, 18 insertions, 21 deletions
diff --git a/rescue/list b/rescue/list
index 6e6640d6b..056b0dd00 100644
--- a/rescue/list
+++ b/rescue/list
@@ -45,8 +45,8 @@
/bin/umount
/etc/inputrc
/etc/termcap
-/lib/libnss_files-*
-/lib/libnss_files.so.2
+/LIB/libnss_files-*
+/LIB/libnss_files.so.2
/sbin/debugfs
/sbin/e2fsck
/sbin/fdisk
@@ -103,22 +103,22 @@
/etc/services
/bin/rpm
/sbin/mkraid
-/usr/lib/rpm/rpmrc
-/usr/lib/rpm/macros
-/usr/lib/rpm/rpmpopt-4.0.4
+/usr/LIB/rpm/rpmrc
+/usr/LIB/rpm/macros
+/usr/LIB/rpm/rpmpopt-4.0.4
/usr/bin/rpm2cpio
/usr/bin/rpmdb
-/usr/lib/rpm/rpmd
+/usr/LIB/rpm/rpmd
/usr/bin/rpme
-/usr/lib/rpm/rpme
+/usr/LIB/rpm/rpme
/usr/bin/rpmi
-/usr/lib/rpm/rpmi
+/usr/LIB/rpm/rpmi
/usr/bin/rpmu
-/usr/lib/rpm/rpmu
+/usr/LIB/rpm/rpmu
/usr/bin/rpmquery
-/usr/lib/rpm/rpmq
+/usr/LIB/rpm/rpmq
/usr/bin/rpmverify
-/usr/lib/rpm/rpmv
+/usr/LIB/rpm/rpmv
/usr/lib/perl5/PERL_VERSION/strict.pm
/usr/lib/perl5/PERL_VERSION/vars.pm
/usr/lib/perl5/PERL_VERSION/warnings/register.pm
@@ -131,7 +131,7 @@
/usr/share/ldetect-lst/pcitable
/usr/share/ldetect-lst/usbtable
/bin/vim-minimal
-/lib/libnss_dns.so.2
-/lib/libresolv.so.2
+/LIB/libnss_dns.so.2
+/LIB/libresolv.so.2
/bin/mt
/sbin/stinit
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 1e44e379d..a8290164b 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -4,10 +4,7 @@ use MDK::Common;
use lib "../perl-install";
use keyboard;
-use Config;
-Config->import;
-my ($arch) = $Config{archname} =~ /(.*)-/;
-
+$lib = (arch() =~ /x86_64/ ? "lib64" : "lib");
$tmp = "/tmp/rescue_tmp";
$mnt = "/tmp/rescue_stage2_img";
$mke2fs = "/sbin/mke2fs -q -m 0 -F -s 1";
@@ -36,7 +33,7 @@ sub install_l {
@l = uniq(map { chomp_($_) } @l);
push @l,
- `ldd @l 2>/dev/null | grep "=>" | sed -e 's/.*=> //' -e 's/ .*//'`;
+ `ldd @l 2>/dev/null | grep "=>" | perl -pe 's/.*=> //; s/ .*//; s,^/lib/.*?/,/lib/,'`;
@l = uniq(map { chomp_($_) } @l);
install_raw(grep { !/lib.*\.so/ } @l);
@@ -77,7 +74,7 @@ foreach (keyboard::loadkeys_files()) {
}
my $perl_version = join ".", unpack "C3", $^V;
-@files = map { chomp; s/PERL_VERSION/$perl_version/g; $_ } (cat_("list"), cat_(`../tools/specific_arch list`));
+@files = map { chomp; s/PERL_VERSION/$perl_version/g; s|/LIB/|/$lib/|g; $_ } (cat_("list"), cat_(`../tools/specific_arch list`));
@files = `ls -d @files`;
$? == 0 or exit 1;
@@ -98,7 +95,7 @@ _ "cp ../kernel/all.modules/$main/modules.dep $tmp/modules";
installown("drvinst", "/usr/bin");
installown("guessmounts", "/usr/bin");
installown("install_bootloader", "/usr/bin");
-if ($arch =~ /^i.86/) {
+if (arch() =~ /^i.86/) {
installown("restore_ms_boot", "/usr/bin");
}
installown("lsparts", "/usr/bin");
@@ -110,7 +107,7 @@ __ "strip $tmp/{lib,bin,sbin}/* $tmp/usr/{bin,sbin}/* 2>/dev/null";
exit 0 if $ARGV[0];
-if ($arch =~ /ppc/) {
+if (arch() =~ /ppc/) {
#- xfs module on PPC is 4MB! - need room to unpack it
$size = `du -s $tmp | cut -f1` + 4096; #- add 4MB of free space
} else {