summaryrefslogtreecommitdiffstats
path: root/make_boot_img
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-02-26 15:05:08 +0000
committerFrancois Pons <fpons@mandriva.com>2003-02-26 15:05:08 +0000
commit9c79e4b52e0f4ddac9fb9ff56cc93ced92763e1c (patch)
tree3d4bd4d2adac10aecbbe697b046e523ac3d71009 /make_boot_img
parent799725765b01bc158556300e595dcaecf4d8f153 (diff)
downloaddrakx-9c79e4b52e0f4ddac9fb9ff56cc93ced92763e1c.tar
drakx-9c79e4b52e0f4ddac9fb9ff56cc93ced92763e1c.tar.gz
drakx-9c79e4b52e0f4ddac9fb9ff56cc93ced92763e1c.tar.bz2
drakx-9c79e4b52e0f4ddac9fb9ff56cc93ced92763e1c.tar.xz
drakx-9c79e4b52e0f4ddac9fb9ff56cc93ced92763e1c.zip
cleaned acpi entries to propagate to all image (floppies included).
Diffstat (limited to 'make_boot_img')
-rwxr-xr-xmake_boot_img7
1 files changed, 3 insertions, 4 deletions
diff --git a/make_boot_img b/make_boot_img
index 0534aac04..21cf2f3bd 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -156,10 +156,9 @@ sub entries_append {
);
my @entries = (
(map { $_->[0] => "$automatic $default_acpi $_->[1]" } group_by2(@simple_entries)),
- if_(member($type, "cdrom", "all"),
- oem => "automatic=method:cdrom $default_vga rescue oem rw",
- acpi => "$default_vga acpi=on"),
- if_($type eq "all", all => "pcmcia $default_vga"),
+ acpi => "$automatic $default_vga",
+ if_(member($type, "cdrom", "all"), oem => "automatic=method:cdrom $default_vga $default_acpi rescue oem rw",),
+ if_($type eq "all", all => "pcmcia $default_vga $default_acpi"),
);
map { [ $_->[0], "$default_append $_->[1]" ] }