From 9c79e4b52e0f4ddac9fb9ff56cc93ced92763e1c Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Wed, 26 Feb 2003 15:05:08 +0000 Subject: cleaned acpi entries to propagate to all image (floppies included). --- make_boot_img | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'make_boot_img') 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]" ] } -- cgit v1.2.1