diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-02-12 09:15:39 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-02-12 09:15:39 +0000 |
| commit | 5edd24c779890a9699a71173ed3909efef120019 (patch) | |
| tree | 21bf1ce34f0df604cbae683ecd02ad23b7ed21b8 | |
| parent | ee79121704c4310e6f287ad57188dfc785b3c1f5 (diff) | |
| download | drakx-backup-do-not-use-5edd24c779890a9699a71173ed3909efef120019.tar drakx-backup-do-not-use-5edd24c779890a9699a71173ed3909efef120019.tar.gz drakx-backup-do-not-use-5edd24c779890a9699a71173ed3909efef120019.tar.bz2 drakx-backup-do-not-use-5edd24c779890a9699a71173ed3909efef120019.tar.xz drakx-backup-do-not-use-5edd24c779890a9699a71173ed3909efef120019.zip | |
re-add cdrom-changedisk.img
| -rwxr-xr-x | make_boot_img | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/make_boot_img b/make_boot_img index f497dec31..79cb6ad43 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', 'pcmcia.img', 'isolinux', 'boot.iso', 'hd_grub.img', 'network.img', 'network_drivers.img'), + if_($arch =~ /i.86/, 'cdrom.img', 'cdrom-changedisk.img', 'pcmcia.img', 'isolinux', 'boot.iso', 'hd_grub.img', 'network.img', 'network_drivers.img'), if_($arch =~ /x86_64/, 'cdrom.img', 'isolinux', 'boot.iso'), if_($arch =~ /ia64/, 'all.img'), ); @@ -174,7 +174,8 @@ sub boot_img_i386 { _ "cat $kernel > $mnt/vmlinuz"; (my $rdz = $img) =~ s/\.img/.rdz/; - initrd($tmp_mnt_initrd, $type, $I, $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" }; if ($@) { |