6 files changed, 18 insertions, 11 deletions
diff --git a/rescue/Makefile b/rescue/Makefile
index bbc0d7dda..b43275b94 100644
--- a/rescue/Makefile
+++ b/rescue/Makefile
@@ -1,13 +1,9 @@
-ARCH := $(patsubst i%86,i386,$(shell uname -m))
-ARCH := $(patsubst sparc%,sparc,$(ARCH))
-
-
-ROOTDEST = /export
+include ../Makefile.config
 
 all: rescue_stage2.bz2
 
 install: rescue_stage2.bz2
-	cp -f $< $(ROOTDEST)/Mandrake/base
+	cp -f $< $(STAGE2_DEST)
 
 rescue_stage2.bz2: kernel_read_part list list.$(ARCH) drvinst guessmounts lsparts rescue-doc make_rescue_img
 	./make_rescue_img
diff --git a/rescue/install_bootloader b/rescue/install_bootloader
index b83334bcf..d49a04581 100755
--- a/rescue/install_bootloader
+++ b/rescue/install_bootloader
@@ -23,7 +23,8 @@ my @mounts = cat_('/proc/mounts');
 grep { (split)[1] =~ m|^/mnt$| } @mounts or die "Your root device isn't mounted on /mnt (according to /proc/mounts)\n";
 -x '/mnt/sbin/lilo' or die "/mnt/sbin/lilo isn't executable, exiting.\n";
 -r '/mnt/etc/lilo.conf' or die "/mnt/etc/lilo.conf isn't readable, exiting.\n";
-cat_('/mnt/etc/mandrake-release') =~ /Mandrake/ or die "/mnt/etc/mandrake-release doesn't contain 'Mandrake', exiting.\n";
+my ($f) = grep { -f $_ } map { "/mnt/etc/$_" } 'mandrakelinux-release', 'mandrake-release';
+$f && cat_($f) =~ /Mandrake/ or die "$f doesn't contain 'Mandrake', exiting.\n";
 
 print "About to re-install Boot Loader of following Mandrake distro:\n\t",
   chomp_(cat_ "/mnt/etc/mandrake-release"),
@@ -37,6 +38,9 @@ die "error: couldn't exec /mnt/sbin/lilo.\n";
 
 #-------------------------------------------------
 #- $Log$
+#- Revision 1.3  2004/09/28 06:24:30  prigaux
+#- handle /etc/mandrakelinux-release
+#-
 #- Revision 1.2  2004/07/20 02:42:12  prigaux
 #- MandrakeSoft -> Mandrakesoft
 #-
diff --git a/rescue/list b/rescue/list
index c442d351b..a29f7f943 100644
--- a/rescue/list
+++ b/rescue/list
@@ -18,7 +18,6 @@
 /bin/hostname
 /bin/kill
 /bin/ln
-/bin/loadkeys
 /usr/bin/du
 /usr/lib/kbd
 /bin/ls
@@ -106,7 +105,7 @@
 /etc/protocols
 /etc/services
 /bin/rpm
-/sbin/mkraid
+/sbin/mdadm
 /usr/lib/rpm/rpmrc
 /usr/lib/rpm/macros
 /usr/lib/rpm/rpmpopt-*
diff --git a/rescue/list.ppc b/rescue/list.ppc
index d81d4a268..4c1616128 100644
--- a/rescue/list.ppc
+++ b/rescue/list.ppc
@@ -1,3 +1,8 @@
+/sbin/resize2fs
+/sbin/resize_reiserfs
+/sbin/mkreiserfs
+/sbin/reiserfsck
+/sbin/xfs_repair
 /usr/lib/perl5/PERL_VERSION/ppc-linux-thread-multi/CORE/libperl.so
 /sbin/pdisk
 /usr/sbin/ybin
diff --git a/rescue/list.x86_64 b/rescue/list.x86_64
index 9cef38a4f..21970eff9 100644
--- a/rescue/list.x86_64
+++ b/rescue/list.x86_64
@@ -2,9 +2,12 @@
 /sbin/resize2fs
 /sbin/resize_reiserfs
 /sbin/rescuept
+/usr/sbin/grub
+/usr/sbin/grub-install
 /sbin/mkreiserfs
 /sbin/reiserfsck
 /sbin/fsck.xfs
 /sbin/xfs_repair
 /sbin/sfdisk
+/boot/grub/stage[12]
 /usr/lib/perl5/PERL_VERSION/x86_64-linux-thread-multi/CORE/libperl.so
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 9c7352338..076273f34 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -122,7 +122,7 @@ if (arch() =~ /ppc/) {
 }
 
 mkdir_p($mnt);
-__ "$sudo umount $rescue 2>/dev/null";
+__ "$sudo umount $mnt 2>/dev/null";
 
 _ "dd if=/dev/zero of=$rescue bs=1k count=$size";
 _ "$mke2fs $rescue";
@@ -133,7 +133,7 @@ _ "$sudo chown -R root.root $tmp";
 _ "$sudo cp -a $tmp/* $mnt";
 _ "$sudo rm -rf $tmp";
 
-_ "$sudo umount $rescue";
+_ "$sudo umount $mnt";
 _ "rmdir $mnt";
 
 _ "bzip2 -f -9 $rescue";