summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-06-03 15:25:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-06-03 15:25:52 +0000
commitb9303682553d2b87e357266025573f00488ef52c (patch)
tree89bd664909227ee7a7502cdf0a47083d7936426d
parent334f2d9fc085cdbd28f0c1000e5cdfc560fe5f90 (diff)
downloaddrakx-b9303682553d2b87e357266025573f00488ef52c.tar
drakx-b9303682553d2b87e357266025573f00488ef52c.tar.gz
drakx-b9303682553d2b87e357266025573f00488ef52c.tar.bz2
drakx-b9303682553d2b87e357266025573f00488ef52c.tar.xz
drakx-b9303682553d2b87e357266025573f00488ef52c.zip
add a rule to build bootcdrom.iso (useful for providing an updated stage1)
-rwxr-xr-xmake_boot_img12
1 files changed, 9 insertions, 3 deletions
diff --git a/make_boot_img b/make_boot_img
index 744988eab..a9eea94a2 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -72,7 +72,9 @@ foreach my $img (@images) {
system("/bin/cp -f move/isolinux/* $tftpboot/move 2>/dev/null");
}
} elsif ($img =~ /boot.iso/) {
- boot_iso($img);
+ boot_iso($img, 0);
+ } elsif ($img =~ /bootcdrom.iso/) {
+ boot_iso($img, 1);
} elsif ($img =~ /drivers/) {
drivers($type, $I, "$img-$_") foreach @kernels;
rename("$img-$main", $img);
@@ -784,10 +786,14 @@ EOF
}
sub boot_iso {
- my ($iso) = @_;
+ my ($iso, $bootcdrom) = @_;
my $cfg = cat_('isolinux/isolinux.cfg') or die 'isolinux missing';
- $cfg =~ s/automatic=method:\w+,?//gm;
+ if ($bootcdrom) {
+ $cfg =~ s/(automatic=method:\w+)/changedisk $1/gm;
+ } else {
+ $cfg =~ s/(automatic=method:\w+)//gm;
+ }
eval { rm_rf('.boot_iso') };
mkdir_p('.boot_iso/isolinux');