summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2011-04-17 11:08:01 +0000
committerAnssi Hannula <anssi@mandriva.org>2011-04-17 11:08:01 +0000
commitbb620fe4d0afc1b724038a050ebc8394a42b57cf (patch)
treec3bebba510d49c4dc99125746e2c96de4bd6629b
parente765ca17fcc1e3cc7d201f82e6cf71b3107bdb64 (diff)
downloaddrakx-bb620fe4d0afc1b724038a050ebc8394a42b57cf.tar
drakx-bb620fe4d0afc1b724038a050ebc8394a42b57cf.tar.gz
drakx-bb620fe4d0afc1b724038a050ebc8394a42b57cf.tar.bz2
drakx-bb620fe4d0afc1b724038a050ebc8394a42b57cf.tar.xz
drakx-bb620fe4d0afc1b724038a050ebc8394a42b57cf.zip
service_harddrake: Adapt from bootsplash to plymouth.
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/service_harddrake9
2 files changed, 5 insertions, 7 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ff83afb64..2a9881fb6 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.42 - 24 February 2011
- increase default disk size to suggest /home partition
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 412586e5c..9de83cf71 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;