On Thu, Mar 28, 2013 at 12:11:42PM +0100, Hector Oron wrote: > Apparently the proposed patch causes installability issues and needs to be > improved. I'll submit updated patch once found the issue.
Find patch attached. Tested and verified. Regards -- Hector Oron
diff -Nru nodm-0.11/debian/nodm.config nodm-0.11/debian/nodm.config --- nodm-0.11/debian/nodm.config 2013-08-07 15:02:45.000000000 +0200 +++ nodm-0.11/debian/nodm.config 2013-06-24 12:00:47.000000000 +0200 @@ -57,6 +57,9 @@ if [ -n "$NODM_XSESSION" ]; then db_set nodm/xsession "$NODM_XSESSION" fi + if [ -n "$NODM_X_TIMEOUT" ]; then + db_set nodm/x_timeout "$NODM_X_TIMEOUT" + fi fi db_input medium nodm/enabled || true @@ -80,5 +83,8 @@ db_input low nodm/xsession || true db_go + + db_input low nodm/x_timeout || true + db_go fi diff -Nru nodm-0.11/debian/nodm.init nodm-0.11/debian/nodm.init --- nodm-0.11/debian/nodm.init 2013-08-07 15:02:45.000000000 +0200 +++ nodm-0.11/debian/nodm.init 2013-06-24 12:00:47.000000000 +0200 @@ -25,13 +25,14 @@ NODM_X_OPTIONS="-nolisten tcp" NODM_USER=root NODM_MIN_SESSION_TIME=60 +NODM_X_TIMEOUT=300 if [ -f /etc/default/$NAME ] then . /etc/default/$NAME fi -export NODM_XINIT NODM_XSESSION NODM_X_OPTIONS NODM_USER NODM_MIN_SESSION_TIME NODM_FIRST_VT +export NODM_XINIT NODM_XSESSION NODM_X_OPTIONS NODM_USER NODM_MIN_SESSION_TIME NODM_FIRST_VT NODM_X_TIMEOUT # If you change the user to a non-root user, make sure you # set allowed_users=anybody in /etc/X11/Xwrapper.config diff -Nru nodm-0.11/debian/nodm.pam nodm-0.11/debian/nodm.pam diff -Nru nodm-0.11/debian/nodm.postinst nodm-0.11/debian/nodm.postinst --- nodm-0.11/debian/nodm.postinst 2013-08-07 15:02:45.000000000 +0200 +++ nodm-0.11/debian/nodm.postinst 2013-06-24 12:00:47.000000000 +0200 @@ -39,6 +39,8 @@ NODM_MIN_SESSION_TIME="$RET" db_get nodm/xsession NODM_XSESSION="$RET" + db_get nodm/x_timeout + NODM_X_TIMEOUT="$RET" if [ -s /etc/default/nodm ] ; then sed -i -r -e "s,^NODM_ENABLED=.*,NODM_ENABLED=$NODM_ENABLED," \ @@ -47,6 +49,7 @@ -e "s,^NODM_X_OPTIONS=.*,NODM_X_OPTIONS='$NODM_X_OPTIONS'," \ -e "s,^NODM_MIN_SESSION_TIME=.*,NODM_MIN_SESSION_TIME=$NODM_MIN_SESSION_TIME," \ -e "s,^NODM_XSESSION=.*,NODM_XSESSION=$NODM_XSESSION," \ + -e "s,^NODM_X_TIMEOUT=.*,NODM_X_TIMEOUT=$NODM_X_TIMEOUT," \ /etc/default/nodm else cat <<EOF > /etc/default/nodm @@ -70,6 +73,10 @@ # If an X session will run for less than this time in seconds, nodm will wait an # increasing bit of time before restarting the session. NODM_MIN_SESSION_TIME=$NODM_MIN_SESSION_TIME + +# Timeout (in seconds) to wait for X to be ready to accept connections. If X is +# not ready before this timeout, it is killed and restarted. +NODM_X_TIMEOUT=$NODM_X_TIMEOUT EOF fi fi diff -Nru nodm-0.11/debian/nodm.templates nodm-0.11/debian/nodm.templates --- nodm-0.11/debian/nodm.templates 2013-08-07 15:02:45.000000000 +0200 +++ nodm-0.11/debian/nodm.templates 2013-06-24 12:00:47.000000000 +0200 @@ -53,6 +53,13 @@ amount of time before restarting the session. The waiting time will grow until a session lasts longer than this amount. +Template: nodm/x_timeout +Type: string +Default: 300 +_Description: Maximum time (in seconds) to wait for X to start: + Timeout (in seconds) to wait for X to be ready to accept connections. If X is + not ready before this timeout, it is killed and restarted. + Template: nodm/xsession Type: string Default: /etc/X11/Xsession diff -Nru nodm-0.11/debian/patches/debian-tweaks.patch nodm-0.11/debian/patches/debian-tweaks.patch diff -Nru nodm-0.11/debian/patches/series nodm-0.11/debian/patches/series diff -Nru nodm-0.11/debian/patches/set-pam-xdisplay.patch nodm-0.11/debian/patches/set-pam-xdisplay.patch diff -Nru nodm-0.11/debian/source/format nodm-0.11/debian/source/format
signature.asc
Description: Digital signature
_______________________________________________ pkg-fso-maint mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-fso-maint
