[gentoo-commits] gentoo-x86 commit in x11-misc/lightdm/files: Xsession session-wrapper-lightdm.patch

[gentoo-commits] gentoo-x86 commit in x11-misc/lightdm/files: Xsession session-wrapper-lightdm.patch

[Markos Chandras (hwoarang)]

hwoarang    11/11/05 01:44:15

  Added:                Xsession session-wrapper-lightdm.patch
  Log:
  Use Ubuntu patch to workaround the localization and other profile problems. Bug #388247
  
  (Portage version: 2.2.0_alpha71/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-misc/lightdm/files/Xsession

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/files/Xsession?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/files/Xsession?rev=1.1&content-type=text/plain

Index: Xsession
===================================================================
#!/bin/sh
#
# LightDM wrapper to run around X sessions.

echo "Running X session wrapper"

# Load profile
for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
    if [ -f "$file" ]; then
        echo "Loading profile from $file";
        . "$file"
    fi
done

# Load resources
for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
    if [ -f "$file" ]; then
        echo "Loading resource: $file"
        xrdb -nocpp -merge "$file"
    fi
done

# Load keymaps
for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
    if [ -f "$file" ]; then
        echo "Loading keymap: $file"
        setxkbmap `cat "$file"`
        XKB_IN_USE=yes
    fi
done    

# Load xmodmap if not using XKB
if [ -z "$XKB_IN_USE" ]; then
    for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
        if [ -f "$file" ]; then
           echo "Loading modmap: $file"
           xmodmap "$file"
        fi
    done
fi

unset XKB_IN_USE

# Run all system xinitrc shell scripts.
xinitdir="/etc/X11/xinit/xinitrc.d"
if [ -d "$xinitdir" ]; then
    for script in $xinitdir/*; do
        echo "Loading xinit script $script"
        if [ -x "$script" -a ! -d "$script" ]; then
            . "$script"
        fi
    done
fi

# Load Xsession scripts
xsessionddir="/etc/X11/Xsession.d"
if [ -d "$xsessionddir" ]; then
    for i in `ls $xsessionddir`; do
        script="$xsessionddir/$i"
        echo "Loading X session script $script"
        if [ -r "$script"  -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
            . "$script"
        fi
    done
fi

echo "X session wrapper complete, running session $@"

exec $@



1.1                  x11-misc/lightdm/files/session-wrapper-lightdm.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/files/session-wrapper-lightdm.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/files/session-wrapper-lightdm.patch?rev=1.1&content-type=text/plain

Index: session-wrapper-lightdm.patch
===================================================================
Index: data/lightdm.conf
===================================================================
--- data.orig/lightdm.conf
+++ data/lightdm.conf
@@ -25,6 +25,7 @@
 #cache-directory=/var/cache/lightdm
 #xsessions-directory=/usr/share/xsessions
 #xgreeters-directory=/usr/share/xgreeters
+session-wrapper=/etc/lightdm/Xsession
 
 #
 # Seat defaults