Hello community, here is the log from the commit of package xorg-x11 checked in at Mon Oct 8 12:32:08 CEST 2007. -------- --- xorg-x11/xorg-x11.changes 2007-10-02 21:43:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2007-10-05 21:28:39.963588000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 5 21:30:41 CEST 2007 - sndirsch@suse.de + +- stop the running display manager instead of the configured one in + /etc/sysconfig/displaymanager (Bug #306035) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.B29086/_old 2007-10-08 12:31:38.000000000 +0200 +++ /var/tmp/diff_new_pack.B29086/_new 2007-10-08 12:31:38.000000000 +0200 @@ -18,7 +18,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.3 -Release: 1 +Release: 3 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -454,6 +454,9 @@ %ghost /var/run/xdm.pid /var/lib/xdm/authdir/ %changelog +* Fri Oct 05 2007 - sndirsch@suse.de +- stop the running display manager instead of the configured one in + /etc/sysconfig/displaymanager (Bug #306035) * Tue Oct 02 2007 - sndirsch@suse.de - xfs 1.0.5 * Document catalogue:<dir> feature ++++++ xdm.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/init.d/xdm new/etc/init.d/xdm --- old/etc/init.d/xdm 2007-09-12 14:53:50.000000000 +0200 +++ new/etc/init.d/xdm 2007-10-05 21:24:59.000000000 +0200 @@ -63,7 +63,10 @@ export WINDOWMANAGER unset DEFAULT_WM SAVEPATH -PIDFILE="/var/run/xdm.pid" +XDM_PIDFILE="/var/run/xdm.pid" +KDM_PIDFILE="/var/run/kdm.pid" +GDM_PIDFILE="/var/run/gdm.pid" +PIDFILE=$XDM_PIDFILE KDEROOTHOME=/root/.kdm export KDEROOTHOME XDMDIR=/etc/X11/xdm @@ -77,26 +80,28 @@ else GDM_BIN=/opt/gnome/sbin/gdm fi +KDM_BIN=/opt/kde3/bin/kdm +WDM_BIN=/usr/bin/wdm RELOADSIGNAL="-HUP" case "${DISPLAYMANAGER##*/}" in - kdm|kde|KDM|KDE) DISPLAYMANAGER=/opt/kde3/bin/kdm - PIDFILE="/var/run/kdm.pid" + kdm|kde|KDM|KDE) DISPLAYMANAGER=$KDM_BIN + PIDFILE=$KDM_PIDFILE ;; xdm) DISPLAYMANAGER=$XDM_BIN ;; gdm|GDM|Gnome|GNOME) DISPLAYMANAGER=$GDM_BIN - PIDFILE="/var/run/gdm.pid" + PIDFILE=$GDM_PIDFILE RELOADSIGNAL="-USR1" ;; - wdm|WDM) DISPLAYMANAGER=/usr/bin/wdm + wdm|WDM) DISPLAYMANAGER=$WDM_BIN ;; console) exit 0 ;; *) DISPLAYMANAGER=$XDM_BIN - if test -x /opt/kde3/bin/kdm; then - DISPLAYMANAGER=/opt/kde3/bin/kdm - PIDFILE="/var/run/kdm.pid" + if test -x $KDM_BIN; then + DISPLAYMANAGER=$KDM_BIN + PIDFILE=$KDM_PIDFILE fi ;; esac @@ -108,13 +113,13 @@ case "$1" in start) # Avoid duplicated messages when earlykdm is in use - if test "$DISPLAYMANAGER" = /opt/kde3/bin/kdm && \ - test -s /var/run/kdm.pid && \ - /sbin/checkproc -p /var/run/kdm.pid /opt/kde3/bin/kdm; then + if test "$DISPLAYMANAGER" = $KDM_BIN && \ + test -s $KDM_PIDFILE && \ + /sbin/checkproc -p $KDM_PIDFILE $KDM_BIN; then rc_exit 0 fi - if test "$DISPLAYMANAGER" != /opt/kde3/bin/kdm; then + if test "$DISPLAYMANAGER" != $KDM_BIN; then test -x /etc/X11/xdm/SuSEconfig.xdm && \ MD5DIR="/var/adm/SuSEconfig/md5" \ /etc/X11/xdm/SuSEconfig.xdm | \ @@ -149,11 +154,27 @@ rc_status -v ;; stop) + # make sure to stop the running one (Bug #306035) + if test -s $KDM_PIDFILE; then + PIDFILE=$KDM_PIDFILE + elif test -s $GDM_PIDFILE; then + PIDFILE=$GDM_PIDFILE + elif test -s $XDM_PIDFILE; then + PIDFILE=$XDM_PIDFILE + fi + if test -f $PIDFILE; then + PID=$(cat $PIDFILE) + DISPLAYMANAGER=$(ps -p $PID -o command h) + fi + DM=${DISPLAYMANAGER##*/} + echo -n "Shutting down service $DM" + # # killproc(8) sleep upto five seconds and sends # SIGKILL if xdm does not terminate within # + killproc -p $PIDFILE -TERM $DISPLAYMANAGER rc_status -v ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org