summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-25 12:51:43 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-25 12:51:43 +0000
commit2f4eff32e61c253072d3663d5754bc44d2d2ff3d (patch)
tree63a139873357b0cdb8a0509c04bd719dc9b89225
parent39db082e96ed2a11eb6d97d219981916e96c04ea (diff)
downloaddrakx-2f4eff32e61c253072d3663d5754bc44d2d2ff3d.tar
drakx-2f4eff32e61c253072d3663d5754bc44d2d2ff3d.tar.gz
drakx-2f4eff32e61c253072d3663d5754bc44d2d2ff3d.tar.bz2
drakx-2f4eff32e61c253072d3663d5754bc44d2d2ff3d.tar.xz
drakx-2f4eff32e61c253072d3663d5754bc44d2d2ff3d.zip
simplify (and remove entry "all", which is nearly "alt0")
-rwxr-xr-xmake_boot_img12
1 files changed, 5 insertions, 7 deletions
diff --git a/make_boot_img b/make_boot_img
index 87b3528b2..183bb38aa 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -210,8 +210,8 @@ sub initrd {
sub entries_append {
my ($type) = @_;
- my $automatic = $type =~ /cdrom/ ? 'automatic=method:cdrom' : '';
- $automatic .= " changedisk" if $type =~ /changedisk/;
+ my $automatic = $type =~ /cdrom|^all/ ? 'automatic=method:cdrom ' : '';
+ $automatic .= 'changedisk ' if $type =~ /changedisk/;
my @simple_entries = (
linux => $default_vga,
@@ -223,9 +223,8 @@ sub entries_append {
rescue => "rescue",
);
my @entries = (
- (map { $_->[0] => "$automatic $default_acpi $_->[1]" } group_by2(@simple_entries)),
- acpi => "$automatic $default_vga",
- if_($type eq "all", all => "pcmcia $default_vga $default_acpi"),
+ (map { $_->[0] => "$automatic$default_acpi $_->[1]" } group_by2(@simple_entries)),
+ acpi => "$automatic$default_vga",
);
map { { label => $_->[0], append => "$default_append $_->[1]" } }
@@ -708,8 +707,7 @@ sub isolinux {
output("isolinux/isolinux.cfg",
syslinux_cfg(150, [
(map {
- { label => $_->{label}, kernel => 'alt0/vmlinuz', initrd => 'alt0/all.rdz',
- append => "$_->{append} automatic=method:cdrom" };
+ { kernel => 'alt0/vmlinuz', initrd => 'alt0/all.rdz', %$_ };
} entries_append('all')),
(map_index {
{ label => "alt$::i", kernel => "alt$::i/vmlinuz", initrd => "alt$::i/all.rdz",