diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-08-01 15:57:57 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-08-01 15:57:57 +0000 |
| commit | 24e3585d2ef8ec182a6c2e701c55f46522e2b7da (patch) | |
| tree | cc43db20cb13dbf23f631417047ced5853bc57f3 | |
| parent | bb55cdfb0709dc943b4e4320957675fabc47fdfe (diff) | |
| download | drakx-24e3585d2ef8ec182a6c2e701c55f46522e2b7da.tar drakx-24e3585d2ef8ec182a6c2e701c55f46522e2b7da.tar.gz drakx-24e3585d2ef8ec182a6c2e701c55f46522e2b7da.tar.bz2 drakx-24e3585d2ef8ec182a6c2e701c55f46522e2b7da.tar.xz drakx-24e3585d2ef8ec182a6c2e701c55f46522e2b7da.zip | |
- revert isolinux starting install by default instead of booting on harddrive (#32040)
| -rw-r--r-- | images/NEWS | 1 | ||||
| -rwxr-xr-x | 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) = @_; |