From 26f3411d4d9797c6a9aa875ca5b87132b53ffd43 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 22 Jan 2004 13:39:41 +0000
Subject: drop cdrom-changedisk (was used on CD2, but not useful, dixit support
 team)

---
 make_boot_img | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'make_boot_img')

diff --git a/make_boot_img b/make_boot_img
index 861e75dcc..7fe701321 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -37,7 +37,7 @@ my @kernels = grep { /^2/ } all('kernel/all.kernels');
 
 
 my @all_images = (
-		  if_($arch =~ /i.86/, 'cdrom.img', 'cdrom-changedisk.img', 'pcmcia.img', 'isolinux', 'boot.iso', 'hd_grub.img'),
+		  if_($arch =~ /i.86/, 'cdrom.img', 'pcmcia.img', 'isolinux', 'boot.iso', 'hd_grub.img'),
 		  if_($arch =~ /x86_64/, 'cdrom.img', 'isolinux', 'boot.iso'),
 		  if_($arch =~ /ia64/, 'all.img'),
 		 );
@@ -171,7 +171,6 @@ sub boot_img_i386 {
     _ "cat $kernel > $mnt/vmlinuz";
 
     (my $rdz = $img) =~ s/\.img/.rdz/;
-    (my $initrd_type = $type) =~ s/-changedisk//;
     initrd($tmp_mnt_initrd, $initrd_type, $I, $rdz);
     my $short_type = substr($type, 0, 8);
     eval { _ "cp -f $rdz $mnt/$short_type.rdz" };
-- 
cgit v1.2.1