diff options
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 19012a660..2edd99a43 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- service_harddrake: + o adapt splash handling for plymouth (for showing dialogs) + Version 13.47 - modify a string in partitioning_wizard.pm to be more grammatically correct (spotted by Sigrid Carrera, on mageia-i18n ML) diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index c8abea227..19333172e 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -219,8 +219,7 @@ my $is_globetrotter = -f '/usr/sbin/mdkmove'; my (%config, $wait); my $in; -my $splash = -f '/proc/splash'; -my $splash_was_silent = cat_('/proc/splash') =~ /, silent : on/; +my $plymouth = -x '/bin/plymouth'; # For each hw, class, detect device, compare and offer to reconfigure if needed foreach my $hw_class (@harddrake::data::tree) { @@ -339,7 +338,7 @@ foreach my $hw_class (@harddrake::data::tree) { if (!$hw_class->{automatic}) { $SIG{ALRM} = sub { $no = 1; kill 15, $pid }; unless ($pid = fork()) { - $splash and eval { output('/proc/splash', 'verbose') } and $splash = 0; + $plymouth and system('plymouth', 'hide-splash'); exec("/usr/share/harddrake/confirm", $Ident, $timeout, $msg); } alarm($timeout); @@ -379,8 +378,4 @@ foreach my $hw_class (@harddrake::data::tree) { log::explanations("created file $last_boot_config"); Storable::store(\%config, $last_boot_config); -# restore bootsplash mode -$splash_was_silent and eval { output('/proc/splash', 'silent') }; - - $in->exit(0) if $in; |