/[soft]/drakx/trunk/perl-install/any.pm
ViewVC logotype

Diff of /drakx/trunk/perl-install/any.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3570 by tv, Mon Mar 12 19:31:03 2012 UTC revision 3571 by colin, Mon Mar 19 18:33:40 2012 UTC
# Line 130  sub setupBootloaderBeforeStandalone { Line 130  sub setupBootloaderBeforeStandalone {
130      my $allow_fb = listlength(cat_("/proc/fb"));      my $allow_fb = listlength(cat_("/proc/fb"));
131      my $cmdline = cat_('/proc/cmdline');      my $cmdline = cat_('/proc/cmdline');
132      my $vga_fb = first($cmdline =~ /\bvga=(\S+)/);      my $vga_fb = first($cmdline =~ /\bvga=(\S+)/);
133      my $quiet = $cmdline =~ /\bsplash=silent\b/;      my $splash = $cmdline =~ /\bsplash\b/;
134      setupBootloaderBefore($do_pkgs, $b, $all_hds, $fstab, $keyboard, $allow_fb, $vga_fb, $quiet);      my $quiet = $cmdline =~ /\bquiet\b/;
135        setupBootloaderBefore($do_pkgs, $b, $all_hds, $fstab, $keyboard, $allow_fb, $vga_fb, $splash, $quiet);
136  }  }
137    
138  sub setupBootloaderBefore {  sub setupBootloaderBefore {
139      my ($_do_pkgs, $bootloader, $all_hds, $fstab, $keyboard, $allow_fb, $vga_fb, $quiet) = @_;      my ($_do_pkgs, $bootloader, $all_hds, $fstab, $keyboard, $allow_fb, $vga_fb, $splash, $quiet) = @_;
140      require bootloader;      require bootloader;
141    
142      #- auto_install backward compatibility      #- auto_install backward compatibility
# Line 207  sub setupBootloaderBefore { Line 208  sub setupBootloaderBefore {
208      my $need_fb = -e "$::prefix/usr/share/bootsplash/scripts/make-boot-splash";      my $need_fb = -e "$::prefix/usr/share/bootsplash/scripts/make-boot-splash";
209      bootloader::suggest($bootloader, $all_hds,      bootloader::suggest($bootloader, $all_hds,
210                          vga_fb => ($force_vga || $vga && $need_fb) && $vga_fb,                          vga_fb => ($force_vga || $vga && $need_fb) && $vga_fb,
211                            splash => $splash,
212                          quiet => $quiet);                          quiet => $quiet);
213    
214      $bootloader->{keytable} ||= keyboard::keyboard2kmap($keyboard);      $bootloader->{keytable} ||= keyboard::keyboard2kmap($keyboard);
Legend:
Removed from v.3570  
changed lines
  Added in v.3571
  ViewVC Help
Powered by ViewVC 1.1.30