Blame 0046-systemd-do-not-flock-for-console.patch
|
Harald Hoyer |
e3ef57 |
From 3d3ddf082b6b61ae559520ff039f7592a58e88b2 Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
e3ef57 |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
e3ef57 |
Date: Thu, 21 Jun 2012 01:03:22 +0200
|
|
Harald Hoyer |
e3ef57 |
Subject: [PATCH] systemd: do not flock for console
|
|
Harald Hoyer |
e3ef57 |
|
|
Harald Hoyer |
e3ef57 |
---
|
|
Harald Hoyer |
e3ef57 |
modules.d/98systemd/dracut-initqueue.sh | 6 ++----
|
|
Harald Hoyer |
e3ef57 |
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
Harald Hoyer |
e3ef57 |
|
|
Harald Hoyer |
e3ef57 |
diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh
|
|
Harald Hoyer |
e3ef57 |
index 830dbee..03f1c9b 100755
|
|
Harald Hoyer |
e3ef57 |
--- a/modules.d/98systemd/dracut-initqueue.sh
|
|
Harald Hoyer |
e3ef57 |
+++ b/modules.d/98systemd/dracut-initqueue.sh
|
|
Harald Hoyer |
e3ef57 |
@@ -59,8 +59,7 @@ while :; do
|
|
Harald Hoyer |
e3ef57 |
fi
|
|
Harald Hoyer |
e3ef57 |
|
|
Harald Hoyer |
e3ef57 |
main_loop=$(($main_loop+1))
|
|
Harald Hoyer |
e3ef57 |
- [ $main_loop -gt $RDRETRY ] \
|
|
Harald Hoyer |
e3ef57 |
- && { flock -s 9 ; emergency_shell "Could not boot."; } 9>/.console_lock
|
|
Harald Hoyer |
e3ef57 |
+ [ $main_loop -gt $RDRETRY ] && emergency_shell "Could not boot."
|
|
Harald Hoyer |
e3ef57 |
done
|
|
Harald Hoyer |
e3ef57 |
|
|
Harald Hoyer |
e3ef57 |
unset job
|
|
Harald Hoyer |
e3ef57 |
@@ -95,8 +94,7 @@ while :; do
|
|
Harald Hoyer |
e3ef57 |
done
|
|
Harald Hoyer |
e3ef57 |
|
|
Harald Hoyer |
e3ef57 |
i=$(($i+1))
|
|
Harald Hoyer |
e3ef57 |
- [ $i -gt 20 ] \
|
|
Harald Hoyer |
e3ef57 |
- && { flock -s 9 ; emergency_shell "Can't mount root filesystem"; } 9>/.console_lock
|
|
Harald Hoyer |
e3ef57 |
+ [ $i -gt 20 ] && emergency_shell "Can't mount root filesystem"
|
|
Harald Hoyer |
e3ef57 |
done
|
|
Harald Hoyer |
e3ef57 |
|
|
Harald Hoyer |
e3ef57 |
{
|