[OE-core] [oe-core][PATCH 09/13] xserver-nodm-init: merge some changes from meta-oe

[Richard Purdie]

On Fri, 2011-09-30 at 09:27 +0200, Martin Jansa wrote:
> * /etc/X11/Xusername handling should be moved to x11-common so the same
>   username and logic is used from initscript and when user starts it
>   from terminal
> 
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
>  .../x11-common/xserver-nodm-init/xserver-nodm      |   30 ++++++--------------
>  1 files changed, 9 insertions(+), 21 deletions(-)
> 
> diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
> index c707a4b..9cd7904 100755
> --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
> +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
> @@ -8,10 +8,7 @@
>  # Default-Stop:      0 1 6
>  ### END INIT INFO
>  
> -killproc() {            # kill the named process(es)
> -        pid=`/bin/pidof $1`
> -        [ "$pid" != "" ] && kill $pid
> -}
> +. /etc/init.d/functions
>  
>  read CMDLINE < /proc/cmdline
>  for x in $CMDLINE; do
> @@ -25,25 +22,16 @@ done
>  
>  case "$1" in
>    start)
> +    # We don't want this script to block the rest of the boot process
> +    if [ "$2" != "background" ]; then
> +      $0 $1 background &
> +    else
>         . /etc/profile
> -       username=root
> +
>         echo "Starting Xserver"
> -       if [ -f /etc/X11/Xusername ]; then
> -           username=`cat /etc/X11/Xusername`
> -           # setting for rootless X
> -           chmod o+w /var/log
> -           chmod g+r /dev/tty[0-3]
> -           chmod o+rw /dev/input/*
> -           # hidraw device is probably needed
> -           if [ -e /dev/hidraw0 ]; then
> -               chmod o+rw /dev/hidraw*
> -           fi
> -       fi
> -       # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211]
> -       su -l -c '/etc/X11/Xserver&' $username 
> -       # Wait for the desktop to say its finished loading
> -       # before loading the rest of the system
> -       # dbus-wait org.matchbox_project.desktop Loaded
> +       . /etc/X11/xserver-common
> +       xinit /etc/X11/Xsession -- `which $XSERVER` $ARGS >/var/log/Xsession.log 2>&1
> +    fi 
>    ;;
>  
>    stop)

This is not "merge some changes from meta-oe", this is "overwrite
whatever is in oe-core with meta-oe" :(.

The above wipes out rootless X support.

I've noticed this theme in several of the patches where for example a
decent long DESCRIPTION and a separate short SUMMARY are replaced with a
single one line SUMMARY.

The fact you've done this means I'm going to have to go over every line
of changes in this and double check what is happening. Some of the
patches look ok but some like this are not.

Cheers,

Richard