rendered paste body## old_revision [1d32c1d9c08aa79c8176d13a9d64f53074be7445]## patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"# from [98a4fb4f6cccc8cf6cf2d49433a3a0094153ad57]# to [7b58c2fa72cf85d175847889a8c3791aea22dfb1]#============================================================--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 98a4fb4f6cccc8cf6cf2d49433a3a0094153ad57+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 7b58c2fa72cf85d175847889a8c3791aea22dfb1@@ -15,12 +15,6 @@ fi if [ -f /usr/bin/Xomap ]; then XSERVER=/usr/bin/Xomap fi-if [ -f /usr/bin/Xw100 ]; then- XSERVER=/usr/bin/Xw100-fi-if [ -f /usr/bin/Ximageon ]; then- XSERVER=/usr/bin/Ximageon-fi . /etc/profile @@ -64,15 +58,16 @@ case `module_id` in "HP iPAQ H5400" | "HP iPAQ H2200") ARGS="$ARGS -br -dpi 100 -rgba rgb" ;; "HP iPAQ HX4700")- ARGS="$ARGS -br -dpi 200" ;;+ ARGS="$ARGS -br -dpi 200"+ W100="yup"+ ;; "Ramses") # What is this "vt2" in aid of? ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;; # both 'Sharp-Collie' and just 'Collie' have been reported- *Poodle)- ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;;- *Collie)+ *Poodle | *Collie) ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270"+ W100="yup" ;; "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") ARGS="$ARGS -br -dpi 200 -rgba rgb" ;;@@ -107,6 +102,15 @@ esac ARGS="$ARGS -screen $S" ;; esac +if [ "$W100"x == "yup"x ]; then+ if [ -f /usr/bin/Xw100 ]; then+ XSERVER=/usr/bin/Xw100+ fi+ if [ -f /usr/bin/Ximageon ]; then+ XSERVER=/usr/bin/Ximageon+ fi+fi+ DISPLAY=':0' +echo exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*-exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*