From 24e3585d2ef8ec182a6c2e701c55f46522e2b7da Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 1 Aug 2007 15:57:57 +0000
Subject: - revert isolinux starting install by default instead of booting on
 harddrive (#32040)

---
 images/NEWS          | 1 +
 images/make_boot_img | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/images/NEWS b/images/NEWS
index 04c333078..31496ebbb 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,4 +1,5 @@
 - add unionfs module
+- revert isolinux starting install by default instead of booting on harddrive (#32040)
 
 Version 1.12 - 17 July 2007, by Olivier "blino" Blin
 
diff --git a/images/make_boot_img b/images/make_boot_img
index 043d99001..21467fadd 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -109,8 +109,8 @@ sub syslinux_msg {
 }
 
 sub syslinux_cfg {
-    my ($entries, $o_default) = @_;
-    my $default = $o_default || 'linux';
+    my ($entries, $b_gfxboot) = @_;
+    my $default = 'linux';
 
     my $header = <<EOF;
 default $default
@@ -137,7 +137,7 @@ EOF
 	($_->{initrd} ? "  append initrd=$_->{initrd} $_->{append}\n" : '');
     } @$entries;
 
-    $header . ($o_default eq 'harddisk' ? $header_gfxboot : $header_non_gfxboot) . join('', @l);
+    $header . ($b_gfxboot ? $header_gfxboot : $header_non_gfxboot) . join('', @l);
 }
 
 sub initrd {
@@ -215,7 +215,7 @@ sub syslinux_cfg_all {
 	      append => join(' ', grep {$_} $default_append, $default_acpi, $default_vga) };
 	} @kernels),
 	{ label => 'memtest', kernel => 'memtest' },
-    ], if_($type =~ /cdrom/, 'harddisk'));
+    ], $type =~ /cdrom/ && 'gfxboot');
 }
 sub remove_ending_zero {
     my ($img) = @_;
-- 
cgit v1.2.1