diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-04-01 09:44:16 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-04-01 09:44:16 +0000 |
| commit | 05a4d73fb33d00d61833106eca90cfce8d7cbede (patch) | |
| tree | 629ca29cfe9d2df553875dd992606811e1cf53c3 | |
| parent | f3dcc49d17e18f54421ba9a26000687ae33ce2f7 (diff) | |
| download | drakx-backup-do-not-use-05a4d73fb33d00d61833106eca90cfce8d7cbede.tar drakx-backup-do-not-use-05a4d73fb33d00d61833106eca90cfce8d7cbede.tar.gz drakx-backup-do-not-use-05a4d73fb33d00d61833106eca90cfce8d7cbede.tar.bz2 drakx-backup-do-not-use-05a4d73fb33d00d61833106eca90cfce8d7cbede.tar.xz drakx-backup-do-not-use-05a4d73fb33d00d61833106eca90cfce8d7cbede.zip | |
pass timeout parameter too
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 2 | ||||
| -rw-r--r-- | perl-install/standalone/service_harddrake_confirm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index d1805ef14..f3b763979 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -94,7 +94,7 @@ foreach (@harddrake::data::tree) { my ($pid, $no); $SIG{ALRM} = sub { $no = 1; kill 15, $pid }; unless ($pid = fork()) { - exec("/usr/share/harddrake/confirm '$Ident' '$msg'"); + exec("/usr/share/harddrake/confirm '$Ident' '$timeout' '$msg'"); } alarm($timeout); wait(); diff --git a/perl-install/standalone/service_harddrake_confirm b/perl-install/standalone/service_harddrake_confirm index 99eaf7b0f..eaf454960 100644 --- a/perl-install/standalone/service_harddrake_confirm +++ b/perl-install/standalone/service_harddrake_confirm @@ -1,7 +1,9 @@ #!/usr/bin/perl use lib qw(/usr/lib/libDrakX); +use common; use interactive; my $in = interactive->vnew; -my $res = $in->ask_okcancel($ARGV[0], $ARGV[1], 1); +my $res = $in->ask_okcancel(N("Hardware changes in \"%s\" class (%s seconds to answer)", $ARGV[0], $ARGV[1]), + $ARGV[2] . N("Do you want to run the appropriate config tool ?"), 1); $in->exit($res); |