summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-07-06 14:41:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-07-06 14:41:56 +0000
commit7b975041ea5dfe72e19f00bbf1237f8e3cb3e7f3 (patch)
treee614b7d77b8a30d60213f907ec891c619c3021b8
parentd45baedc0a1cee278ceda95b77eb1762427bc89d (diff)
downloaddrakx-7b975041ea5dfe72e19f00bbf1237f8e3cb3e7f3.tar
drakx-7b975041ea5dfe72e19f00bbf1237f8e3cb3e7f3.tar.gz
drakx-7b975041ea5dfe72e19f00bbf1237f8e3cb3e7f3.tar.bz2
drakx-7b975041ea5dfe72e19f00bbf1237f8e3cb3e7f3.tar.xz
drakx-7b975041ea5dfe72e19f00bbf1237f8e3cb3e7f3.zip
no_comment
-rw-r--r--rescue/list1
-rw-r--r--rescue/list.i3861
-rw-r--r--rescue/list.sparc1
-rwxr-xr-xrescue/make_rescue_img8
4 files changed, 5 insertions, 6 deletions
diff --git a/rescue/list b/rescue/list
index a9062e966..7a2ae2058 100644
--- a/rescue/list
+++ b/rescue/list
@@ -113,6 +113,7 @@
/sbin/killall5
/usr/bin/perl
/usr/bin/perl5
+/usr/bin/perl5.6.0
/usr/bin/extract_archive
/bin/sort
/usr/bin/md5sum
diff --git a/rescue/list.i386 b/rescue/list.i386
index ed63a53cc..1c5538253 100644
--- a/rescue/list.i386
+++ b/rescue/list.i386
@@ -3,5 +3,4 @@
/sbin/mkreiserfs
/sbin/lspci
/usr/share/pci.ids
-/usr/bin/perl5.6.0
/sbin/lilo
diff --git a/rescue/list.sparc b/rescue/list.sparc
index 00ca832e2..074144cf0 100644
--- a/rescue/list.sparc
+++ b/rescue/list.sparc
@@ -1,2 +1 @@
-/usr/bin/perl5.6.0
/sbin/silo
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index ffe078992..32186628a 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -35,6 +35,10 @@ sub install_lib {
_ "$sudo rm -rf $tmp" if -e $tmp;
_ "mkdir $tmp";
_ 'find . -name "*~" | xargs rm -f';
+foreach (cat_("dirs")) {
+ chomp;
+ commands::mkdir_("-p", "$tmp$_");
+}
_ "cp -a tree/* $tmp";
_ "find $tmp -name 'CVS*' | xargs rm -rf";
_ "cd $tmp; mkdir -p lib tmp modules proc";
@@ -51,10 +55,6 @@ foreach (cat_("list"), cat_(`../tools/specific_arch list`)) {
install($_);
chomp, install_lib($_) foreach `ldd $_ 2>/dev/null | grep "=>" | sed -e 's/.*=> //' -e 's/ .*//'`;
}
-foreach (cat_("dirs")) {
- chomp;
- commands::mkdir_("-p", "$tmp$_");
-}
foreach (cat_("aliases")) {
chomp; my ($f, $dest) = split;
symlink $dest, "$tmp$f";