/[soft]/drakx/trunk/perl-install/standalone/service_harddrake
ViewVC logotype

Diff of /drakx/trunk/perl-install/standalone/service_harddrake

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

revision 446 by dmorgan, Sun Feb 6 22:37:08 2011 UTC revision 916 by anssi, Sun Apr 17 14:33:45 2011 UTC
# Line 219  my $is_globetrotter = -f '/usr/sbin/mdkm Line 219  my $is_globetrotter = -f '/usr/sbin/mdkm
219    
220  my (%config, $wait);  my (%config, $wait);
221  my $in;  my $in;
222  my $splash = -f '/proc/splash';  my $plymouth = -x '/bin/plymouth';
 my $splash_was_silent = cat_('/proc/splash') =~ /, silent : on/;  
223    
224  # For each hw, class, detect device, compare and offer to reconfigure if needed  # For each hw, class, detect device, compare and offer to reconfigure if needed
225  foreach my $hw_class (@harddrake::data::tree) {  foreach my $hw_class (@harddrake::data::tree) {
# Line 339  foreach my $hw_class (@harddrake::data:: Line 338  foreach my $hw_class (@harddrake::data::
338      if (!$hw_class->{automatic}) {      if (!$hw_class->{automatic}) {
339          $SIG{ALRM} = sub { $no = 1; kill 15, $pid };          $SIG{ALRM} = sub { $no = 1; kill 15, $pid };
340          unless ($pid = fork()) {          unless ($pid = fork()) {
341              $splash and eval { output('/proc/splash', 'verbose') } and $splash = 0;              $plymouth and system('plymouth', 'hide-splash');
342              exec("/usr/share/harddrake/confirm", $Ident, $timeout, $msg);              exec("/usr/share/harddrake/confirm", $Ident, $timeout, $msg);
343          }          }
344          alarm($timeout);          alarm($timeout);
# Line 379  foreach my $hw_class (@harddrake::data:: Line 378  foreach my $hw_class (@harddrake::data::
378  log::explanations("created file $last_boot_config");  log::explanations("created file $last_boot_config");
379  Storable::store(\%config, $last_boot_config);  Storable::store(\%config, $last_boot_config);
380    
 # restore bootsplash mode  
 $splash_was_silent and eval { output('/proc/splash', 'silent') };  
   
   
381  $in->exit(0) if $in;  $in->exit(0) if $in;
Legend:
Removed from v.446  
changed lines
  Added in v.916
  ViewVC Help
Powered by ViewVC 1.1.30