Thanks for the fix - pushed to git master.   (Sorry about taking so long to
have someone get to it.)

        -Alan Coopersmith-           [email protected]
         Sun Microsystems, Inc. - X Window System Engineering


Andres Salomon wrote:
> When startx fails to start X, it's most likely xinit that failed.  xinit
> returns a proper return code (1), but that gets clobbed in the startx
> script by clean-up commands.  This patch saves $? from xinit and forces
> startx to exit with that value.
> 
> This way, if startx actually fails to start X, $? reflects that.
> 
> Signed-off-by: Andres Salomon <[email protected]>
> ---
>  startx.cpp |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/startx.cpp b/startx.cpp
> index f911499..05d28e3 100644
> --- a/startx.cpp
> +++ b/startx.cpp
> @@ -320,6 +320,7 @@ XINIT "$client" $clientargs -- "$server" $display 
> $serverargs
>  #endif
>  
>  #endif
> +retval=$?
>  
>  if [ x"$enable_xauth" = x1 ] ; then
>      if [ x"$removelist" != x ]; then
> @@ -347,3 +348,6 @@ screenrestore
>  #if defined(sun)
>  kbd_mode -a
>  #endif
> +
> +exit $retval
> +
_______________________________________________
xorg-devel mailing list
[email protected]
http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to