diff options
| author | Colin Guthrie <colin@mageia.org> | 2012-04-03 08:47:44 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2012-04-03 08:47:44 +0100 |
| commit | 0830ab5148cea791a47f63947825870505a9d0d7 (patch) | |
| tree | b41a2c2bab6c7207b02f57799583dfcc537c825d | |
| parent | b009616cb9c87586506ad1e55fe277bac93da627 (diff) | |
| download | initscripts-0830ab5148cea791a47f63947825870505a9d0d7.tar initscripts-0830ab5148cea791a47f63947825870505a9d0d7.tar.gz initscripts-0830ab5148cea791a47f63947825870505a9d0d7.tar.bz2 initscripts-0830ab5148cea791a47f63947825870505a9d0d7.tar.xz initscripts-0830ab5148cea791a47f63947825870505a9d0d7.zip | |
harddrake: Hopefully solve the cpufreq stall on first boot.
As harddrake is run by mandrake_everytime (which starts Before=basic.target)
and it, in turn may try to start cpufreq (which starts After=basic.target)
a deadlock can occur.
To work around this, we pass the --no-block option to systemctl
to return flow and allow us to continue.
Hopefully solves mga#4772
| -rw-r--r-- | mandriva/mandrake_everytime | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mandriva/mandrake_everytime b/mandriva/mandrake_everytime index 1456b9b7..5673c4ee 100644 --- a/mandriva/mandrake_everytime +++ b/mandriva/mandrake_everytime @@ -51,7 +51,7 @@ fi HARDDRAKE_TOOL=/usr/share/harddrake/service_harddrake if [ "$HARDDRAKE_ONBOOT" != "no" ] && [ -x $HARDDRAKE_TOOL ]; then gprintf "Checking for new hardware" - $HARDDRAKE_TOOL 2>/dev/null + SYSTEMCTL_NO_BLOCK=1 $HARDDRAKE_TOOL 2>/dev/null RETVAL=$? if [ "$RETVAL" -eq 0 ]; then action "" /bin/true |