Changeset 937

Timestamp:

Jan 14, 2008 10:05:56 PM (5 years ago)

Author:

dkg

Message:

debirf: made xkiosk back off if there are 5 restarts in a single minute. (closes #74).

Location:

trunk/debirf

Files:

• debian/changelog (modified) (1 diff)
• fs/usr/share/debirf/modules/xkiosk (modified) (1 diff)

trunk/debirf/debian/changelog

@@ -21 +21 @@
   * changed old "networking" module to "network"
   * added root-passwd module, and added it to xkiosk profile.
+  * added Vcs-Svn, Vcs-Browser, and XS-Dm-Upload-Allowed fields to
+    debian/control
+  * make xkiosk back off if there are 5 restarts in under a minute 
+    (closes CMRG #74)
 
  -- Jameson Rollins <jrollins@fifthhorseman.net>  Sun, 13 Jan 2008 22:01:57 -0500

trunk/debirf/fs/usr/share/debirf/modules/xkiosk

@@ -89 +89 @@
 # creat run script
 # guest users starts X
-cat <<EOF > "$RUNIT_DIR_DEBIRF"/run
+cat <<'EOF' > "$RUNIT_DIR_DEBIRF"/run
 #!/bin/sh
 exec 2>&1
+
+# only allow 5 attempts at starting up X each minute.  This gives
+# debirf admins a chance to fix from the console if there's repeated
+# failing invocations of the X server (see
+# http://cmrg.fifthhorseman.net/ticket/74)
+
+BUCKETDIR=./bucket
+mkdir -p "$BUCKETDIR"
+find "$BUCKETDIR" -type f '!' -cmin 1 -delete
+if [ $(find "$BUCKETDIR" -type f | wc -l ) -ge 5 ]; then
+    echo "5 or more retries in the last minute.  Waiting a minute..."
+    sleep 60
+fi
+touch "$BUCKETDIR"/$(date +%s)
+
 exec chpst -u guest:audio:video -e env /usr/bin/startx
 EOF