summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-22 13:39:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-22 13:39:41 +0000
commit26f3411d4d9797c6a9aa875ca5b87132b53ffd43 (patch)
tree6c39543accb05a50cc6c8ac23bce811275e28e9d
parentafe35c57ca5640c3828cf506e7e5ff887867ddd0 (diff)
downloaddrakx-26f3411d4d9797c6a9aa875ca5b87132b53ffd43.tar
drakx-26f3411d4d9797c6a9aa875ca5b87132b53ffd43.tar.gz
drakx-26f3411d4d9797c6a9aa875ca5b87132b53ffd43.tar.bz2
drakx-26f3411d4d9797c6a9aa875ca5b87132b53ffd43.tar.xz
drakx-26f3411d4d9797c6a9aa875ca5b87132b53ffd43.zip
drop cdrom-changedisk (was used on CD2, but not useful, dixit support team)
-rwxr-xr-xmake_boot_img3
1 files changed, 1 insertions, 2 deletions
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" };