diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-07-01 03:46:46 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-07-01 03:46:46 +0000 |
| commit | 35e125c9162dea1e60b3f34f8f85923f2b90a2f0 (patch) | |
| tree | 04ff50b2f1af52d129b4dfd82380d5317b96e9cb | |
| parent | c818a63bfd70c03858ff99e7b524ff31eb5b652a (diff) | |
| download | drakx-35e125c9162dea1e60b3f34f8f85923f2b90a2f0.tar drakx-35e125c9162dea1e60b3f34f8f85923f2b90a2f0.tar.gz drakx-35e125c9162dea1e60b3f34f8f85923f2b90a2f0.tar.bz2 drakx-35e125c9162dea1e60b3f34f8f85923f2b90a2f0.tar.xz drakx-35e125c9162dea1e60b3f34f8f85923f2b90a2f0.zip | |
don't spawn a new shell if it's already running (useful when using the no-reboot-restart-install blino trick)
| -rw-r--r-- | perl-install/install_any.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index c111d117c..31163a31d 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -313,8 +313,11 @@ sub start_i810fb() { sub spawnShell() { return if $::local_install || $::testing || dont_run_directly_stage2(); + my $shellpid_file = '/var/run/drakx_shell.pid'; + return if -e $shellpid_file && -d '/proc/' . chomp_(cat_($shellpid_file)); + if (my $shellpid = fork()) { - output('/var/run/drakx_shell.pid', $shellpid); + output($shellpid_file, $shellpid); return; } |