X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fgrml-screen;h=ddc1a98ab2eecc5e9cdfba48449b5c15ee4e4db8;hb=68e8f6591df51e871e29e646c621b52c5b76949d;hp=1288aa11f758607783093f1e08fbbfed1fceecca;hpb=e720deae78f1eda5e6f62629606c194f16796762;p=grml-scripts-core.git

diff --git a/usr_bin/grml-screen b/usr_bin/grml-screen
index 1288aa1..ddc1a98 100755
--- a/usr_bin/grml-screen
+++ b/usr_bin/grml-screen
@@ -1,16 +1,11 @@
 #!/bin/dash
 # Filename:      grml-screen
-# Purpose:       wrapper for screen
+# Purpose:       wrapper for screen to start with appropriate configuration
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sun Jan 08 15:30:06 CET 2006 [mika]
 ################################################################################
 
-# fix tty permissions
-#  sudo chmod 660      $TTY
-#  sudo chown root.tty $TTY
-
 # export variable USER for use withing GNU screen:
   export USER=`id -un`
 
@@ -19,14 +14,58 @@
   sudo chmod 660       $TTY
   sudo chown $USER.tty $TTY
 
+# FIXME: fix for screen race-conditions
+PID_FILE_="/var/lock/grml-screen"
+PID_FILE_CREATED_="false"
+MY_PID_="$$"
+if [ ! -d "/var/run/screen/S-$USER" ]; then
+    # no /var/run/screen/S-$USER and possible no /var/run/screen either -> locking
+    for i in `seq 40`; do   # 40*0.25 = 10 seconds
+        if lockfile-create --retry 0 $PID_FILE_; then
+            echo $MY_PID_ >$PID_FILE_
+            PID_FILE_CREATED_="true"
+            break
+        else
+            PID_FILE_CREATED_="error"
+        fi
+        sleep 0.25
+    done
+fi
+if [ $PID_FILE_CREATED_ = "true" ]; then
+    # FORK BEGIN
+    (
+        for i in `seq 40`; do   # 40*0.25 = 10 seconds
+            if [ ! -d "/var/run/screen/S-$USER" ]; then
+                sleep 0.25  # educated guess
+            else
+                break
+            fi
+        done
+        if [ `cat $PID_FILE_` = $MY_PID_ ]; then
+            rm $PID_FILE_
+            lockfile-remove $PID_FILE_
+        fi
+    )&
+    # FORK END
+elif [ $PID_FILE_CREATED_ = "error" ]; then
+    SLEEP_TIME_="$(( $$ % 5 * 5 + 5 ))"
+    echo "grml-screen: Error could not create lockfile! (sleeping for $SLEEP_TIME_)" >&2
+    sleep $SLEEP_TIME_
+elif [ $PID_FILE_CREATED_ = "false" ]; then
+    echo "nothing to do" &>/dev/null
+else
+    echo "grml-screen: internal error - PID_FILE_CREATED_ == \"$PID_FILE_CREATED_\"" >&2
+fi
+
 # now run screen with config
   cd $HOME     # important for e.g. hardcopy-feature
+
   if [ `id -u` = 0 ] ; then
-    exec screen -c /etc/grml/screenrc
-  elif [ -r $HOME/.screenrc ] ; then
-    exec screen -c $HOME/.screenrc
+    exec screen -U -c /etc/grml/screenrc
+  elif [ -r "$HOME/.screenrc" ] ; then
+    exec screen -U -c "$HOME/.screenrc"
   else
-    exec screen -c /etc/grml/screenrc_grml
+    exec screen -U -c /etc/grml/screenrc_grml
   fi
 
 ## END OF FILE #################################################################