change file descriptor for flock locking

dash does not like filedescriptors > 9

diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
index 499f5869cae7b1fd7b2156999e7a37e701f2eeb0..48cc0f7995f5a7724f77a4dad9e99d72d1e0feed 100755 (executable)
--- a/modules.d/90crypt/cryptroot-ask.sh
+++ b/modules.d/90crypt/cryptroot-ask.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 [ -b /dev/mapper/$2 ] && exit 0
-(
-       flock -s 200
+{
+       flock -s 9
        /sbin/cryptsetup luksOpen -T1 $1 $2 </dev/console >/dev/console 2>&1
-) 200>/.console.lock
+} 9>/.console.lock
 

diff --git a/modules.d/99base/init b/modules.d/99base/init
index fbfad05c15db8728e8407073d6504f6670265339..ce26de6074398a346bf06dd444348f33627b7c3a 100755 (executable)
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -79,10 +79,7 @@ while :; do
 
     sleep 0.5
     i=$(($i+1))
-    (
-       flock -s 200
-       [ $i -gt 20 ] && emergency_shell
-    ) 200>/.console_lock
+    { flock -s 9 ; [ $i -gt 20 ] && emergency_shell; } 9>/.console_lock
 done
 
 # pre pivot scripts are sourced just before we switch over to the new root.