summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-06-05 17:48:29 +0000
committerThierry Vignaud <tv@mageia.org>2012-06-05 17:48:29 +0000
commitf2d6c71099c1f496fbc006df7b41ce45b7185b0c (patch)
treec5dfc2e4c21d08ffa0891e2eac705ec97314d2c7 /perl-install
parentb7973e4f02752c2a2b2727576dccf55d1aafb3a9 (diff)
downloaddrakx-f2d6c71099c1f496fbc006df7b41ce45b7185b0c.tar
drakx-f2d6c71099c1f496fbc006df7b41ce45b7185b0c.tar.gz
drakx-f2d6c71099c1f496fbc006df7b41ce45b7185b0c.tar.bz2
drakx-f2d6c71099c1f496fbc006df7b41ce45b7185b0c.tar.xz
drakx-f2d6c71099c1f496fbc006df7b41ce45b7185b0c.zip
(spawnShell) spawn a shell like in regular mode
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/any.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index f0484d5fe..41dd61c15 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
- debug mode:
o do not start udev twice
o just start the installer if one quits the shell
+ o spawn a shell like in regular mode
Version 14.26 - 5 June 2012
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 03d8654b1..433181f76 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -44,7 +44,7 @@ sub is_network_install {
}
sub spawnShell() {
- return if $::local_install || $::testing || dont_run_directly_stage2();
+ return if $::local_install || $::testing;
my $shellpid_file = '/var/run/drakx_shell.pid';
return if -e $shellpid_file && -d '/proc/' . chomp_(cat_($shellpid_file));