Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Tue Feb 22 15:04:38 CET 2011.
-------- --- xorg-x11/xorg-x11.changes 2011-02-01 13:31:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-02-22 14:17:58.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 22 13:13:57 UTC 2011 - [email protected] + +- /etc/init.d/xdm + * avoid duplicate messages on boot/shutdown/reboot (bnc #671783) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.R9mt9P/_old 2011-02-22 15:01:08.000000000 +0100 +++ /var/tmp/diff_new_pack.R9mt9P/_new 2011-02-22 15:01:08.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: bison Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 3 +Release: 45 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities ++++++ 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 2011-02-02 12:34:51.000000000 +0100 +++ new/etc/init.d/xdm 2011-02-22 14:13:21.000000000 +0100 @@ -22,6 +22,20 @@ # Description: X Display Manager ### END INIT INFO +# Avoid duplicated messages when earlyxdm was active +case "$EARLYXDM" in + start) + # earlyxdm is calling us, remember this + > /var/run/earlyxdm.start + ;; + "") + # earlyxdm was already active, exit now + if test -e /var/run/earlyxdm.start ; then + rm -f /var/run/earlyxdm.start + exit 0 + fi +esac + . /etc/rc.status . /etc/sysconfig/displaymanager . /etc/sysconfig/language @@ -178,16 +192,6 @@ || [ "$DISPLAYMANAGER" = "$GDM_BIN" ]; then splashcopy 0 6 fi - # Avoid duplicated messages when earlyxdm is in use - if [ "$DISPLAYMANAGER" = "$KDM_BIN" -a -s $KDM_PIDFILE ]; then - /sbin/checkproc -p $KDM_PIDFILE $KDM_BIN && rc_exit 0 - elif [ "$DISPLAYMANAGER" = "$KDM4_BIN" -a -s $KDM_PIDFILE ]; then - /sbin/checkproc -p $KDM_PIDFILE $KDM4_BIN && rc_exit 0 - elif [ "$DISPLAYMANAGER" = "$GDM_BIN" -a -s $GDM_PIDFILE ]; then - /sbin/checkproc -p $GDM_PIDFILE $GDM_BIN && rc_exit 0 - elif [ "$DISPLAYMANAGER" = "$ENTRANCE_BIN" -a -s $ENTRANCE_PIDFILE ]; then - /sbin/checkproc -p $ENTRANCE_PIDFILE $ENTRANCE_BIN && rc_exit 0 - fi if [ "$DISPLAYMANAGER" != "$KDM_BIN" -a \ "$DISPLAYMANAGER" != "$KDM4_BIN" -a \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
