diff options
| author | Erwan Velu <erwan@mandriva.org> | 2002-10-30 17:22:17 +0000 |
|---|---|---|
| committer | Erwan Velu <erwan@mandriva.org> | 2002-10-30 17:22:17 +0000 |
| commit | 8785f12640289bff4b9c34e11c5fd961afdd0adc (patch) | |
| tree | 7b95218c56e6b60307160cabd0ff626a30868f41 /make_boot_img | |
| parent | 74fc81889d7fc79c35db551056299cc322269fbc (diff) | |
| download | drakx-backup-do-not-use-8785f12640289bff4b9c34e11c5fd961afdd0adc.tar drakx-backup-do-not-use-8785f12640289bff4b9c34e11c5fd961afdd0adc.tar.gz drakx-backup-do-not-use-8785f12640289bff4b9c34e11c5fd961afdd0adc.tar.bz2 drakx-backup-do-not-use-8785f12640289bff4b9c34e11c5fd961afdd0adc.tar.xz drakx-backup-do-not-use-8785f12640289bff4b9c34e11c5fd961afdd0adc.zip | |
Applying patch from 8.2, ka.img is working fine in old mode
Diffstat (limited to 'make_boot_img')
| -rwxr-xr-x | make_boot_img | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/make_boot_img b/make_boot_img index 269be0e5a..ca1c4a004 100755 --- a/make_boot_img +++ b/make_boot_img @@ -1,6 +1,6 @@ #!/usr/bin/perl -@ARGV >= 2 or die "usage: $0 <image> all|other|cdrom|hd|network|usb|blank|pcmcia|live|tftp|tftprd\n"; +@ARGV >= 2 or die "usage: $0 <image> all|other|cdrom|hd|network|usb|blank|pcmcia|live|tftp|tftprd|ka\n"; use Config; use MDK::Common; @@ -41,6 +41,7 @@ $install = $ {{ tftprd => "stage1-full", pcmcia => "stage1-full", network => "stage1-network", + ka => "stage1-network", usb => "stage1-usb", cdrom => "stage1-cdrom", hd => "stage1-disk", @@ -94,10 +95,17 @@ sub initrd { my ($mnt, $img) = @_; my ($ltype, $I) = $type =~ /(.*?)(64)/; $ltype ||= $type; my $tmp = "$ENV{HOME}/tmp/initrd"; - my $tar = "$instdir/stage1-data/stage1.tar.bz2"; + my $tar = ""; + if ($type eq "ka") { + $tar = "$instdir/stage1-data/stage1-with-kadeploy.tar.bz2"; + $mke2fs = $mke2fs . " -N 700"; + } + else { + $tar = "$instdir/stage1-data/stage1.tar.bz2"; + } __ "$sudo umount $tmp $mnt 2>/dev/null"; - _ "dd if=/dev/zero of=$tmp bs=1k count=" . ($arch =~ /ia64/ ? ($type eq "all" ? 16386 : 16384) : ($type eq "all" ? 4000 : 2000)); + _ "dd if=/dev/zero of=$tmp bs=1k count=" . ($arch =~ /ia64/ ? ($type eq "all" ? 16386 : 16384) : ($type eq "ka" ? 2400 : ($type eq "all" ? 4000 : 2000))); _ "$mke2fs $tmp"; _ "$sudo mount -t ext2 $tmp $mnt -o loop"; @@ -123,6 +131,7 @@ sub initrd { $modz = "kernel/all.modules$I/$ext"; _ "$sudo cp -f $modz/${ltype}_modules.mar $mnt/modules/modules$I.mar" if $type !~ /blank/; _ "$sudo cp -f $modz/modules.dep $mnt/modules/"; + _ "$sudo cp -f $modz/ext3.o $modz/jbd.o $mnt/modules" if $type eq "ka"; _ "$sudo umount $mnt"; @@ -168,7 +177,7 @@ sub boot_img_i386 { if ($type eq "hd") { _ "bunzip2 -c $instdir/init-data/msgboot.img.bz2 > $img"; - } elsif ($type eq "all") { + } elsif ($type eq "all" || $type eq "ka") { _ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo-2880.img.bz2 > $img"; } elsif ($type eq "blank") { _ "bunzip2 -c $instdir/init-data/msgboot-blank.img.bz2 > $img"; |