summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-10-22 06:21:30 +0000
committerThierry Vignaud <tv@mageia.org>2012-10-22 06:21:30 +0000
commitd3f9f9cd627781154ce33a0dbf6315a785570288 (patch)
tree12ecd884bb8486dfc55601177165f5d3470dc310
parenteea859cb399d8da62fb5779c1f9e694b0871b9ea (diff)
downloaddrakx-d3f9f9cd627781154ce33a0dbf6315a785570288.tar
drakx-d3f9f9cd627781154ce33a0dbf6315a785570288.tar.gz
drakx-d3f9f9cd627781154ce33a0dbf6315a785570288.tar.bz2
drakx-d3f9f9cd627781154ce33a0dbf6315a785570288.tar.xz
drakx-d3f9f9cd627781154ce33a0dbf6315a785570288.zip
(start_udev) fix detecting if udev is already running
Spot by Colin, broken since commit r4817 June 5 2012: "(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, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 2fe2ea166..c0200dee6 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- fix detecting if udev is already running
- include FIRMWARE packages from Cards+ in detected graphical drivers,
to install radeon-firmware during install (#6438, #7641)
- properly generate stage2 with a usrmove-esque fs layout
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 6717a089e..220398ecd 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -293,7 +293,7 @@ sub exitInstall {
#-######################################################################################
sub start_udev() {
- return if -e "/dev/zero";
+ return if fuzzy_pidofs('udevd');
# Ensure /run is mounted
mkdir("/run", 0755);