summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-25 13:21:36 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-25 13:21:36 +0000
commit8b61295844cd79951abc07850ec8b131a9617378 (patch)
tree6bcc953afbbe1e1253ddf5961d93fb6b42873d4a
parent00fa474c6a9f453f01bc9cca6d7f123c8998506a (diff)
downloaddrakx-8b61295844cd79951abc07850ec8b131a9617378.tar
drakx-8b61295844cd79951abc07850ec8b131a9617378.tar.gz
drakx-8b61295844cd79951abc07850ec8b131a9617378.tar.bz2
drakx-8b61295844cd79951abc07850ec8b131a9617378.tar.xz
drakx-8b61295844cd79951abc07850ec8b131a9617378.zip
create syslinux_all_files() out of isolinux(), and use it for boot_iso()
-rwxr-xr-xmake_boot_img81
1 files changed, 42 insertions, 39 deletions
diff --git a/make_boot_img b/make_boot_img
index 8b7efad9d..24a13f338 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -72,9 +72,7 @@ foreach my $img (@images) {
system("/bin/cp -f move/isolinux/* $tftpboot/move 2>/dev/null");
}
} elsif ($img =~ /boot.iso/) {
- boot_iso($img, 0, \@kernels);
- } elsif ($img =~ /bootcdrom.iso/) {
- boot_iso($img, 1, \@kernels);
+ boot_iso($img, \@kernels);
} elsif ($img =~ /drivers/) {
drivers($type, $I, "$img-$_") foreach @kernels_BOOT;
rename("$img-$main_BOOT", $img);
@@ -698,33 +696,60 @@ rescue-net: boots the rescue image from a network server
}
-sub isolinux {
- my ($main, @kernels) = @_;
- @kernels = ($main, grep { $_ ne $main } @kernels);
- _ "rm -rf isolinux"; mkdir "isolinux", 0777;
+sub syslinux_all_files {
+ my ($dir, $kernels) = @_;
+
+ eval { rm_rf($dir) }; mkdir_p($dir);
+
+ @$kernels or die "syslinux_all_files: no kernel\n";
$default_vga =~ /788/ or die 'we rely on vga=788 for bootsplash';
my $bootspash_cfg = '/etc/bootsplash/themes/Mandrakelinux/config/bootsplash-800x600.cfg';
-e $bootspash_cfg or die "can't find $bootspash_cfg";
each_index {
- mkdir "isolinux/alt$::i", 0777;
- _ "cp kernel/all.kernels/$_/vmlinuz isolinux/alt$::i";
+ mkdir "$dir/alt$::i", 0777;
+ _ "cp kernel/all.kernels/$_/vmlinuz $dir/alt$::i";
initrd($tmp_mnt_initrd, 'all', '', "images/all.rdz-$_");
_ "splash -s -f $bootspash_cfg >> images/all.rdz-$_" if !/BOOT/;
- _ "mv images/all.rdz-$_ isolinux/alt$::i/all.rdz";
- } @kernels;
+ rename("images/all.rdz-$_", "$dir/alt$::i/all.rdz");
+ } @$kernels;
+
+ _ "lilo-bmp2mdk file:isolinux-graphic.bmp >$dir/boot.msg";
+
+ _ "install -m 644 -D /boot/memtest* $dir/test/memtest.bin";
+
+ output("$dir/help.msg", syslinux_msg('help.msg.xml'));
+ output("$dir/advanced.msg", syslinux_msg('advanced.msg.xml',
+ "\nYou can choose the following kernels :\n",
+ map_index { " o " . syslinux_color('white') . "alt$::i" . syslinux_color('default') . " is kernel $_\n" } @$kernels));
+}
+
+sub isolinux {
+ my ($main, @kernels) = @_;
+ @kernels = ($main, grep { $_ ne $main } @kernels);
- _ "lilo-bmp2mdk file:isolinux-graphic.bmp >isolinux/boot.msg";
+ syslinux_all_files('isolinux', \@kernels);
_ "cp /usr/lib/syslinux/isolinux.bin isolinux/isolinux.bin";
- _ "install -m 644 -D /boot/memtest* isolinux/test/memtest.bin";
output("isolinux/isolinux.cfg", syslinux_cfg_all('cdrom'));
+}
+
+sub boot_iso {
+ my ($iso, $kernels) = @_;
+
+ syslinux_all_files('.boot_iso/isolinux', $kernels);
- output("isolinux/help.msg", syslinux_msg('help.msg.xml'));
- output("isolinux/advanced.msg", syslinux_msg('advanced.msg.xml',
- "\nYou can choose the following kernels :\n",
- map_index { " o " . syslinux_color('white') . "alt$::i" . syslinux_color('default') . " is kernel $_\n" } @kernels));
+ output('.boot_iso/VERSION', map { "$_\n" }
+ $ENV{DISTRIB_DESCR},
+ scalar gmtime(),
+ '', @$kernels);
+
+ _ "cp /usr/lib/syslinux/isolinux.bin .boot_iso/isolinux/isolinux.bin";
+ output('.boot_iso/isolinux/isolinux.cfg', syslinux_cfg_all('cdrom-changedisk'));
+
+ _ "mkisofs -r -f -J -cache-inodes -V 'Mdk Boot ISO' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o $iso .boot_iso";
+ rm_rf('.boot_iso');
}
sub isolinux_move {
@@ -793,28 +818,6 @@ EOF
unlink $mapfile;
}
-sub boot_iso {
- my ($iso, $bootcdrom, $kernels) = @_;
-
- -e 'isolinux/isolinux.cfg' or die 'isolinux missing';
-
- eval { rm_rf('.boot_iso') };
- mkdir_p('.boot_iso/isolinux');
- _ "cd .boot_iso/isolinux ; ln -s ../../isolinux/* .";
-
- output('.boot_iso/VERSION', map { "$_\n" }
- $ENV{DISTRIB_DESCR},
- scalar gmtime(),
- '', @$kernels);
-
- my $cfg_file = '.boot_iso/isolinux/isolinux.cfg';
- unlink $cfg_file;
- output($cfg_file, syslinux_cfg_all('cdrom-changedisk'));
-
- _ "mkisofs -r -f -J -cache-inodes -V 'Mdk Boot ISO' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o $iso .boot_iso";
- rm_rf('.boot_iso');
-}
-
sub drivers {
my ($type, $I, $img) = @_;