summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-06-05 17:48:32 +0000
committerThierry Vignaud <tv@mageia.org>2012-06-05 17:48:32 +0000
commite7b4e2b9b82bea82f281ae9ea0c1e61cc37b44c8 (patch)
treec120b2a95d9f0badb5657e8961d2b7a9861e0da0 /perl-install/install
parentf2d6c71099c1f496fbc006df7b41ce45b7185b0c (diff)
downloaddrakx-e7b4e2b9b82bea82f281ae9ea0c1e61cc37b44c8.tar
drakx-e7b4e2b9b82bea82f281ae9ea0c1e61cc37b44c8.tar.gz
drakx-e7b4e2b9b82bea82f281ae9ea0c1e61cc37b44c8.tar.bz2
drakx-e7b4e2b9b82bea82f281ae9ea0c1e61cc37b44c8.tar.xz
drakx-e7b4e2b9b82bea82f281ae9ea0c1e61cc37b44c8.zip
(main) do not try to mount /sys twice if udev was started by a script in debug mode
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/install2.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 589287dc6..37f2dc7aa 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -610,7 +610,7 @@ sub main {
log::l("second stage install running (", install::any::drakx_version($o), ")");
eval { output('/proc/sys/kernel/modprobe', "\n") } if !$::local_install && !$::testing; #- disable kmod
- eval { fs::mount::mount('none', '/sys', 'sysfs', 1) };
+ eval { fs::mount::mount('none', '/sys', 'sysfs', 1) } if !install::any::dont_run_directly_stage2();
eval { touch('/root/non-chrooted-marker.DrakX') }; #- helps distinguishing /root and /mnt/root when we don't know if we are chrooted
if ($::local_install) {