From 6314fcc4b9aed9cc4a6aa13567fb1edfde72be19 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 23 May 2000 13:51:50 +0000
Subject: *** empty log message ***

---
 perl-install/install_steps.pm | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 2bbcc82c1..9020b47ab 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -828,33 +828,19 @@ sub setupBootloader($) {
 	    run_program::rooted($o->{prefix}, "swriteboot", "-f1", $b->{boot}, "/boot/bootlx");
 	};
 	run_program::rooted($o->{prefix}, "abootconf", $b->{boot}, $b->{part_nb});
-<<<<<<< install_steps.pm
-
-
-        modules::load('loop');
-=======
  
         modules::load('loop');
->>>>>>> 1.216
 	output "$o->{prefix}/etc/aboot.conf", 
-<<<<<<< install_steps.pm
 	map_index { -e "$o->{prefix}/boot/initrd-$_->[1]" ? 
 			    "$::i:$b->{part_nb}$_->[0] root=$b->{root} initrd=/boot/initrd-$_->[1] $b->{perImageAppend}\n" :
 			    "$::i:$b->{part_nb}$_->[0] root=$b->{root} $b->{perImageAppend}\n" }
 	map { run_program::rooted($o->{prefix}, "mkinitrd", "-f", "/boot/initrd-$_->[1]", "--ifneeded", $_->[1]) ;#or
-		  -s "$o->{prefix}/boot/initrd-$_->[1]" or unlink "$o->{prefix}/boot/initrd-$_->[1]";$_ } grep { $_->[0] && $_->[1] }
+	  #unlink "$o->{prefix}/boot/initrd-$_->[1]";$_ } grep { $_->[0] && $_->[1] }
+	  $_ } grep { $_->[0] && $_->[1] }
 	map { [ m|$o->{prefix}(/boot/vmlinux-(.*))| ] } eval { glob_("$o->{prefix}/boot/vmlinux-*") };
 #	output "$o->{prefix}/etc/aboot.conf", 
 #	  map_index { "$::i:$b->{part_nb}$_ root=$b->{root} $b->{perImageAppend}\n" }
 #	    map { /$o->{prefix}(.*)/ } eval { glob_("$o->{prefix}/boot/vmlinux*") };
-=======
-	map_index { -e "$o->{prefix}/boot/initrd-$_->[1]" ? 
-			    "$::i:$b->{part_nb}$_->[0] root=$b->{root} initrd=/boot/initrd-$_->[1] $b->{perImageAppend}\n" :
-			    "$::i:$b->{part_nb}$_->[0] root=$b->{root} $b->{perImageAppend}\n" }
-	map { run_program::rooted($o->{prefix}, "mkinitrd", "-f", "/boot/initrd-$_->[1]", "--ifneeded", $_->[1]) or
-		  unlink "$o->{prefix}/boot/initrd-$_->[1]" } grep { $_->[0] && $_->[1] }
-	map { [ m|$o->{prefix}(/boot/vmlinux-(.*))| ] } eval { glob_("$o->{prefix}/boot/vmlinux-*") };
->>>>>>> 1.216
     } elsif (arch() =~ /^sparc/) {
         silo::install($o->{prefix}, $o->{bootloader});
     } else {
-- 
cgit v1.2.1