summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-06-05 17:48:26 +0000
committerThierry Vignaud <tv@mageia.org>2012-06-05 17:48:26 +0000
commitb7973e4f02752c2a2b2727576dccf55d1aafb3a9 (patch)
tree60c1a00083c1f8050207ecd6672e9953278bf747
parent8acb02b140a64def08de6f8a4718b25240890307 (diff)
downloaddrakx-b7973e4f02752c2a2b2727576dccf55d1aafb3a9.tar
drakx-b7973e4f02752c2a2b2727576dccf55d1aafb3a9.tar.gz
drakx-b7973e4f02752c2a2b2727576dccf55d1aafb3a9.tar.bz2
drakx-b7973e4f02752c2a2b2727576dccf55d1aafb3a9.tar.xz
drakx-b7973e4f02752c2a2b2727576dccf55d1aafb3a9.zip
(start_udev) do not start udev twice in debug mode
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/install2.pm2
2 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 82e9ae5d1..f0484d5fe 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- debug mode:
+ o do not start udev twice
o just start the installer if one quits the shell
Version 14.26 - 5 June 2012
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 5df051231..589287dc6 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -292,6 +292,8 @@ sub exitInstall {
#-######################################################################################
sub start_udev() {
+ return if -e "/dev/zero";
+
# Ensure /run is mounted
mkdir("/run", 0755);
run_program::run("mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run");