diff -ur drakxtools-13.51.old/perl-install/bootloader.pm drakxtools-13.51/perl-install/bootloader.pm --- drakxtools-13.51.old/perl-install/bootloader.pm 2011-06-27 19:02:32.000000000 +0400 +++ drakxtools-13.51/perl-install/bootloader.pm 2011-08-19 08:04:43.000000000 +0400 @@ -131,15 +131,15 @@ } sub rebuild_initrd { - my ($kernel_version, $bootloader, $entry, $initrd) = @_; +# my ($kernel_version, $bootloader, $entry, $initrd) = @_; - my $old = $::prefix . $entry->{initrd} . '.old'; - unlink $old; - rename "$::prefix$initrd", $old; - if (!mkinitrd($kernel_version, $bootloader, $entry, $initrd)) { - log::l("rebuilding initrd failed, putting back the old one"); - rename $old, "$::prefix$initrd"; - } +# my $old = $::prefix . $entry->{initrd} . '.old'; +# unlink $old; +# rename "$::prefix$initrd", $old; +# if (!mkinitrd($kernel_version, $bootloader, $entry, $initrd)) { +# log::l("rebuilding initrd failed, putting back the old one"); +# rename $old, "$::prefix$initrd"; +# } } sub remove_boot_splash { @@ -738,13 +738,17 @@ if (!$b_no_initrd) { $v->{initrd} = mkinitrd($kernel_str->{version}, $bootloader, $v, "/boot/$initrd_long"); + } else { + # we just set up copy of the universal initrd, and we need to add proper info + # in bootloader configuration + $v->{initrd} = '/boot/initrd.img'; } if (!$b_nolink) { $v->{kernel_or_dev} = '/boot/' . kernel_str2vmlinuz_short($kernel_str); _do_the_symlink($bootloader, $v->{kernel_or_dev}, $vmlinuz_long); - if ($v->{initrd}) { + if ($v->{initrd} && !$b_no_initrd) { $v->{initrd} = '/boot/' . kernel_str2initrd_short($kernel_str); _do_the_symlink($bootloader, $v->{initrd}, $initrd_long); } @@ -1055,15 +1059,15 @@ root => $root, if_($options{vga_fb}, vga => $options{vga_fb}), #- using framebuffer if_($options{vga_fb} && $options{quiet}, append => "splash=silent logo.nologo quiet"), - }); + },"",1); if ($options{vga_fb} && $e->{label} eq 'linux') { - add_kernel($bootloader, $kernel, { root => $root, label => 'linux-nonfb' }); + add_kernel($bootloader, $kernel, { root => $root, label => 'linux-nonfb' },"",1); } } add_kernel($bootloader, $kernels[0], - { root => $root, label => 'failsafe', append => 'failsafe' }) + { root => $root, label => 'failsafe', append => 'failsafe' },"",1) if @kernels; if (arch() =~ /ppc/) { diff -ur drakxtools-13.51.old/perl-install/check_min_sys_requirements.pm drakxtools-13.51/perl-install/check_min_sys_requirements.pm --- drakxtools-13.51.old/perl-install/check_min_sys_requirements.pm 2011-06-27 19:02:32.000000000 +0400 +++ drakxtools-13.51/perl-install/check_min_sys_requirements.pm 2011-08-19 13:23:36.000000000 +0400 @@ -1,6 +1,11 @@ package check_min_sys_requirements; +use Exporter; +$VERSION = 1.0; +@ISA = qw(Exporter); + +@EXPORT = qw(&get_live_system_size &check_min_sys_requirements); use common; use utf8; @@ -54,10 +59,17 @@ if ($parameter eq "hdd") { $_[1]= $size; } + if ($parameter eq "imagesize") { + $_[2] = $size; + } } } } +sub get_live_system_size { + min_system_requirements($unused1, $unused2, $imagesize); + return $imagesize; +} sub check_min_sys_requirements { my ($in) = @_;