Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Fri Sep 23 10:34:38 CEST 2011.
-------- --- xorg-x11/xorg-x11.changes 2011-08-25 14:13:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-09-22 16:49:31.000000000 +0200 @@ -1,0 +2,50 @@ +Thu Sep 22 14:47:33 UTC 2011 - [email protected] + +- Update /etc/X11/xdm/sys.xsession: do not start a gpg agent if + gnome-keyring is running, since starting with GNOME 3, + gnome-keyring plays that role. Also, drop support for + seahorse-agent as gpg agent for the same reason. Fix bnc#692277. + +------------------------------------------------------------------- +Wed Sep 21 08:33:05 UTC 2011 - [email protected] + +- Don't use %{_libexecdir} it's not uniformly defined on all + supported products. + +------------------------------------------------------------------- +Tue Sep 20 14:35:10 UTC 2011 - [email protected] + +- Change %{_libdir} to ${_libexecdir}. + +------------------------------------------------------------------- +Tue Sep 20 13:38:22 UTC 2011 - [email protected] + +- add fallback files for all DMs which have been updated + to suport the new xdm startup script. + +------------------------------------------------------------------- +Wed Aug 31 10:28:56 UTC 2011 - [email protected] + +- xdm.tar.bz2: Fixed some bugs in the xdm startup script, + mode HOWTO.xdm to rhe sources as a separate file. + +------------------------------------------------------------------- +Tue Aug 30 10:01:45 UTC 2011 - [email protected] + +- add missing "%dir %{_sysconfdir}/X11/displaymanagers" + to specfile. + +------------------------------------------------------------------- +Thu Aug 25 10:33:08 UTC 2011 - [email protected] + +- xdm.tar.bz2: + Remove any display manager specific stuff from + /etc/xinit.d/xdm. + Display manager specific settings will be read + from scripts in /etc/X11/displaymanagers. + Those script need to be provided with the display + manager package. A HOWTO describing how this + scipt should look like can be found in this + directory. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- HOWTO.xdm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.W5It6J/_old 2011-09-23 10:34:30.000000000 +0200 +++ /var/tmp/diff_new_pack.W5It6J/_new 2011-09-23 10:34:30.000000000 +0200 @@ -17,6 +17,7 @@ # norootforbuild +%define _dminitdir %{_prefix}/lib/X11/displaymanagers Name: xorg-x11 BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel libpng-devel ncurses-devel @@ -144,6 +145,7 @@ Source200: misc.tar.bz2 Source201: twm.tar.bz2 Source202: xdm.tar.bz2 +Source2021: HOWTO.xdm Source203: xfs.tar.bz2 Source204: xinit.tar.bz2 Source205: desktopfiles.tar.bz2 @@ -420,6 +422,7 @@ esac popd done +%{__cp} %{S:2021} . # Xresources, Xmodmap, ... pushd $RPM_BUILD_ROOT %{__tar} xjf '%{S:200}' @@ -477,6 +480,15 @@ %endif %dir %{_libdir}/X11/xsm %dir %{_libdir}/X11/x11perfcomp +%dir %{_dminitdir} +%{_dminitdir}/xdm +%{_dminitdir}/entrance.fallback +%{_dminitdir}/gdm.fallback +%{_dminitdir}/kdm.fallback +%{_dminitdir}/lxdm.fallback +%{_dminitdir}/slim.fallback +%{_dminitdir}/wdm.fallback +%doc HOWTO.xdm %config /etc/logrotate.d/xdm %config /etc/pam.d/xdm %config /etc/pam.d/xdm-np ++++++ HOWTO.xdm ++++++ Display Manager Scriptlets HOWTO ================================ To keep display manager specific code out of the generic start script (/etc/init.d/xdm) as much as possible display managers should provide a script file that provides anything specific to this dm. At minimum the script file needs to provide: here <DM> denotes the name of the file. This should be the same as the pid file generated by the display manager - without the .pid extent. # this function matches the command line argument. If it finds a match it initializes any dm specific variables and returns 0 (success) otherwise it returns 1 (fail). At minimum it needs to set the full path the the display manager binary. It may set STARTPROC to a function that gets run prior to starting a dm, RELOADPROC to a function that's run to reload the DM configuration, PROBEPROC to a function that's run when the DM status is probed. Any those functions should return 0 on success or any other value on failure. Additionally it may initialize any other variables needed by the DM. <DM>_vars() { case $1 in <thisdm>) DISPLAYMANAGER=/usr/bin/<thisdm> STARTPROC=<DM>_start # optional RELOADPROC=<DM>_reload # optional PROBEPROC=<DM>_probe # optional .... } ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/sys.xsession new/etc/X11/xdm/sys.xsession --- old/etc/X11/xdm/sys.xsession 2011-05-06 16:54:25.000000000 +0200 +++ new/etc/X11/xdm/sys.xsession 2011-09-22 16:47:03.000000000 +0200 @@ -72,6 +72,16 @@ fi # +# No gpg-agent if a gpg session is already provided by an other agent. +# +if test "$usegpg" = yes -a -n "$GNOME_KEYRING_PID" ; then + # gnome-keyring provides a gpg agent starting with GNOME 3 + if test -d "$GNOME_KEYRING_CONTROL"; then + usegpg=no + fi +fi + +# # Run ssh-agent only if ssh service is configured and avaliable. # Check if there is already a running ssh-agent and if use this. # @@ -104,35 +114,6 @@ fi # -# No gpg-agent if within a gnome session a seahorse-agent is available. -# Note that this should happen *after* any ssh-agent as SSH_AUTH_SOCK -# is used by the seahorse-agent. -# -if test "$usegpg" = yes -a -d "$HOME/.gnupg" && seahorse=$(type -p seahorse-agent) ; then - case "${WINDOWMANAGER##*/}" in - gnome*) - GPG_AGENT_FILE="$HOME/.gnupg/agent.info" - test -s "$GPG_AGENT_FILE" && . "$GPG_AGENT_FILE" - - if test -n "$GPG_AGENT_INFO" ; then - GPG_AGENT_PID=${GPG_AGENT_INFO#*:} - GPG_AGENT_PID=${GPG_AGENT_PID%%:*} - if test -n "$GPG_AGENT_PID" && checkproc -p $GPG_AGENT_PID $seahorse ; then - export GPG_AGENT_INFO - else - unset GPG_AGENT_INFO - fi - fi - - if test -z "$GPG_AGENT_INFO" ; then - eval $($seahorse --variables 2>/dev/null) - echo "GPG_AGENT_INFO=$GPG_AGENT_INFO" > "$GPG_AGENT_FILE" - fi - usegpg=no - esac -fi - -# # Run gpg-agent only if gpg service is configured and avaliable. # Check if there is already a running gpg-agent and if use this. # 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-04-05 14:48:47.000000000 +0200 +++ new/etc/init.d/xdm 2011-09-02 09:27:16.000000000 +0200 @@ -71,6 +71,8 @@ done unset lc val +test -z "$DEFAULT_WM" && DEFAULT_WM=twm + if test -z "$WINDOWMANAGER" ; then SAVEPATH=$PATH PATH=$PATH:/usr/X11R6/bin:/usr/openwin/bin @@ -92,84 +94,20 @@ unset DEFAULT_WM export WINDOWMANAGER -XDM_PIDFILE="/var/run/xdm.pid" -KDM_PIDFILE="/var/run/kdm.pid" -GDM_PIDFILE="/var/run/gdm.pid" -SLIM_PIDFILE="/var/run/slim.lock" -LXDM_PIDFILE="/var/run/lxdm.pid" -ENTRANCE_PIDFILE="/var/run/entrance.pid" -PIDFILE=$XDM_PIDFILE -KDEROOTHOME=/root/.kdm -export KDEROOTHOME -XDMDIR=/etc/X11/xdm -if [ -x /usr/bin/xdm ]; then - XDM_BIN=/usr/bin/xdm -else - XDM_BIN=/usr/X11R6/bin/xdm -fi -if [ -x /usr/sbin/gdm ]; then - GDM_BIN=/usr/sbin/gdm -else - GDM_BIN=/opt/gnome/sbin/gdm -fi -KDM_BIN=/opt/kde3/bin/kdm -KDM4_BIN=/usr/bin/kdm -WDM_BIN=/usr/bin/wdm -SLIM_BIN=/usr/bin/slim -LXDM_BIN=/usr/bin/lxdm -ENTRANCE_BIN=/usr/sbin/entranced +DMDIR=/etc/X11/xdm RELOADSIGNAL="-HUP" -DM=${DISPLAYMANAGER##*/} +PIDFILELNK="/var/run/displaymanager.pid" -case "${DM}" in - kdm3) DISPLAYMANAGER=$KDM_BIN - PIDFILE=$KDM_PIDFILE - ;; - kdm|kde|KDM|KDE) DISPLAYMANAGER=$KDM_BIN - if [ ! -r "$DISPLAYMANAGER" ]; then - DISPLAYMANAGER=$KDM4_BIN - fi - PIDFILE=$KDM_PIDFILE - ;; - kdm4) DISPLAYMANAGER=$KDM4_BIN - PIDFILE=$KDM_PIDFILE - ;; - xdm) DISPLAYMANAGER=$XDM_BIN - ;; - gdm|GDM|Gnome|GNOME) DISPLAYMANAGER=$GDM_BIN - PIDFILE=$GDM_PIDFILE - RELOADSIGNAL="-USR1" - ;; - wdm|WDM) DISPLAYMANAGER=$WDM_BIN - ;; - slim|SLIM) DISPLAYMANAGER=$SLIM_BIN - XDMOPTIONS=-d - PIDFILE=$SLIM_PIDFILE - ;; - lxdm|LXDM) DISPLAYMANAGER=$LXDM_BIN - XDMOPTIONS=-d - PIDFILE=$LXDM_PIDFILE - ;; - entrance) - DISPLAYMANAGER=$ENTRANCE_BIN - PIDFILE=$ENTRANCE_PIDFILE - ;; - console) exit 0 - ;; - *) DISPLAYMANAGER=$XDM_BIN - if test -x $KDM_BIN; then - DISPLAYMANAGER=$KDM_BIN - PIDFILE=$KDM_PIDFILE - elif test -x $KDM4_BIN; then - DISPLAYMANAGER=$KDM4_BIN - PIDFILE=$KDM_PIDFILE - fi - ;; -esac -test ! -x "$DISPLAYMANAGER" && DISPLAYMANAGER=$XDM_BIN -rc_reset +xdm_reload_files () { + test -x /etc/X11/xdm/SuSEconfig.xdm && \ + MD5DIR="/var/adm/SuSEconfig/md5" \ + /etc/X11/xdm/SuSEconfig.xdm | \ + sed 's+\(.*\)+/etc/init.d/xdm: \1+g' | \ + /bin/logger + return 0 +} splashcopy() { @@ -187,42 +125,57 @@ fi } -case "$1" in - start) - if [ "$DISPLAYMANAGER" = "$KDM4_BIN" ] \ - || [ "$DISPLAYMANAGER" = "$GDM_BIN" ]; then - splashcopy 0 6 +#set -x + +DM=${DISPLAYMANAGER##*/} + +case "$DM" in + console) + exit 0 + ;; + *) + for i in /usr/lib/X11/displaymanagers/* + do + tmp=${i%.fallback} + test "$tmp" != "$i" -a -e $tmp && continue # pick foodm over foodm.fallback + DISPLAY_MANAGERS="$DISPLAY_MANAGERS ${tmp##*/}" + . $i + done + for i in $DISPLAY_MANAGERS + do + name="${i}_vars" + PIDFILE=/var/run/$i.pid; + $name $DM && break; + done + if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ] + then + PIDFILE=/var/run/xdm.pid + xdm_vars xdm # FALLBACK fi + unset i + ;; +esac - if [ "$DISPLAYMANAGER" != "$KDM_BIN" -a \ - "$DISPLAYMANAGER" != "$KDM4_BIN" -a \ - "$DISPLAYMANAGER" != "$ENTRANCE_BIN" -a \ - "$DISPLAYMANAGER" != "$GDM_BIN" ]; then - test -x /etc/X11/xdm/SuSEconfig.xdm && \ - MD5DIR="/var/adm/SuSEconfig/md5" \ - /etc/X11/xdm/SuSEconfig.xdm | \ - sed 's+\(.*\)+/etc/init.d/xdm: \1+g' | \ - /bin/logger - fi +DM=${DISPLAYMANAGER##*/} + +rc_reset +case "$1" in + start) # use system keyboard as global X keyboard configuration if [ -x /etc/X11/xdm/keytable ]; then /etc/X11/xdm/keytable - fi + fi + [ -n "$STARTPROC" ] && $STARTPROC echo -n "Starting service $DM" # Don't start xdm if no Xserver is configured and xdm is not # configured for remote access - if [ ! -x /usr/bin/X -a ! -x /usr/X11R6/bin/X -a \ - "$DISPLAYMANAGER_REMOTE_ACCESS" = "no" ]; then + if [ ! -x /usr/bin/X -a "$DISPLAYMANAGER_REMOTE_ACCESS" = "no" ]; + then rc_status -u rc_exit fi - if [ "$DISPLAYMANAGER" = "$GDM_BIN" -a \ - "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" -a \ - "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ]; then - XDMOPTIONS="--no-console" - fi # Graphical failsafe mode (Bug #246158). # # Needs changes in kernel commandline of "Failsafe" entry in @@ -249,56 +202,43 @@ fi startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed # After a crash or a kill signal we may have - # a wrong owner ship of /dev/xconsole + # a wrong ownership of /dev/xconsole if rc_status ; then - if test -x $XDMDIR/TakeDevices ; then - $XDMDIR/TakeDevices + if test -x $DMDIR/TakeDevices ; then + $DMDIR/TakeDevices else chown root:tty /dev/xconsole /dev/tty0 chmod 622 /dev/xconsole /dev/tty0 fi - else - case "${DM}" in - slim|SLIM) - test -s $PIDFILE || pgrep -f $DISPLAYMANAGER > $PIDFILE - esac + ln -s $PIDFILE $PIDFILELNK fi 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 - elif test -s "$SLIM_PIDFILE"; then - PIDFILE=$SLIM_PIDFILE - elif test -s "$LXDM_PIDFILE"; then - PIDFILE=$LXDM_PIDFILE - elif test -s "$ENTRANCE_PIDFILE"; then - PIDFILE=$ENTRANCE_PIDFILE - fi - if test -s $PIDFILE; then - read -t 1 PID < $PIDFILE + if test -s $PIDFILELNK; then + read -t 1 PID < $PIDFILELNK if CHECKDM=$(ps ho command= -p $PID) ; then - DISPLAYMANAGER=${CHECKDM%%[[:blank:]]*} - DM=${DISPLAYMANAGER##*/} + DISPLAYMANAGER_BIN=${CHECKDM%%[[:blank:]]*} + PIDFILE=$(readlink $PIDFILELNK) + else + rm -f $PIDFILELNK $(readlink $PIDFILELNK) fi unset CHECKDM else - rm -f $PIDFILE - unset PIDFILE - fi - echo -n "Shutting down service $DM" + rm -f $PIDFILELNK + fi + + test -n "$DISPLAYMANAGER_BIN" && \ + echo -n "Shutting down service ${DISPLAYMANAGER_BIN##*/}" # # killproc(8) sleep upto five seconds and sends # SIGKILL if xdm does not terminate within # - killproc ${PIDFILE:+-p ${PIDFILE}} $DISPLAYMANAGER + killproc -p $PIDFILE -TERM $DISPLAYMANAGER_BIN + rm -f $PIDFILELNK $PIDFILE rc_status -v ;; restart) @@ -307,12 +247,8 @@ rc_status ;; reload|force-reload) - test -x /etc/X11/xdm/SuSEconfig.xdm && \ - MD5DIR="/var/adm/SuSEconfig/md5" \ - /etc/X11/xdm/SuSEconfig.xdm | \ - sed 's+\(.*\)+/etc/init.d/xdm: \1+g' | \ - /bin/logger echo -n "Reload service $DM" + [ -n "$RELOADPROC" ] && $RELOADPROC killproc -p $PIDFILE $RELOADSIGNAL $DISPLAYMANAGER rc_status -v ;; @@ -322,11 +258,7 @@ rc_status -v ;; probe) - if test $XDMDIR/xdm-config -nt $PIDFILE -o \ - $XDMDIR/Xservers -nt $PIDFILE - then - echo reload - fi + [ -n "$PROBEPROC" ] && $PROBEPROC ;; try-restart|condrestart) $0 status diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usr/lib/X11/displaymanagers/entrance.fallback new/usr/lib/X11/displaymanagers/entrance.fallback --- old/usr/lib/X11/displaymanagers/entrance.fallback 1970-01-01 01:00:00.000000000 +0100 +++ new/usr/lib/X11/displaymanagers/entrance.fallback 2011-09-20 15:37:20.000000000 +0200 @@ -0,0 +1,10 @@ +entrancedm_vars () { + case $1 in + entrance) + DISPLAYMANAGER=/usr/sbin/entranced + ;; + *) + return 1 + esac + return 0 +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usr/lib/X11/displaymanagers/gdm.fallback new/usr/lib/X11/displaymanagers/gdm.fallback --- old/usr/lib/X11/displaymanagers/gdm.fallback 1970-01-01 01:00:00.000000000 +0100 +++ new/usr/lib/X11/displaymanagers/gdm.fallback 2011-09-07 11:38:33.000000000 +0200 @@ -0,0 +1,24 @@ +gdm_start_proc () { + if [ "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" -a \ + "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ]; then + XDMOPTIONS="--no-console" + fi + splashcopy 0 6 + return 0 +} + +gdm_vars() { + case "${DISPLAYMANAGER##*/}" in + gdm|GDM|Gnome|GNOME) + RELOADSIGNAL="-USR1" + if [ -x /usr/sbin/gdm ]; then + DISPLAYMANAGER=/usr/sbin/gdm + else + DISPLAYMANAGER=/opt/gnome/sbin/gdm + fi + STARTPROC=gdm_start_proc + ;; + *) return 1 ;; + esac + return 0 +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usr/lib/X11/displaymanagers/kdm.fallback new/usr/lib/X11/displaymanagers/kdm.fallback --- old/usr/lib/X11/displaymanagers/kdm.fallback 1970-01-01 01:00:00.000000000 +0100 +++ new/usr/lib/X11/displaymanagers/kdm.fallback 2011-09-07 11:37:30.000000000 +0200 @@ -0,0 +1,32 @@ +kdm_start_proc() { + splashcopy 0 6 + return 0 +} + +kdm_vars() { + KDM4_BIN=/usr/bin/kdm + KDM_BIN=/opt/kde3/bin/kdm + case "${DISPLAYMANAGER##*/}" in + kdm3) + export KDEROOTHOME=/root/.kdm + DISPLAYMANAGER=$KDM_BIN + STARTPROC=kdm_start_proc + ;; + kdm|kde|KDM|KDE) + export KDEROOTHOME=/root/.kdm + DISPLAYMANAGER=$KDM_BIN + if [ ! -r "$DISPLAYMANAGER" ]; then + DISPLAYMANAGER=$KDM4_BIN + fi + STARTPROC=kdm_start_proc + ;; + kdm4) + export KDEROOTHOME=/root/.kdm + DISPLAYMANAGER=$KDM4_BIN + STARTPROC=kdm_start_proc + ;; + *) return 1 ;; + esac + return 0 +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usr/lib/X11/displaymanagers/lxdm.fallback new/usr/lib/X11/displaymanagers/lxdm.fallback --- old/usr/lib/X11/displaymanagers/lxdm.fallback 1970-01-01 01:00:00.000000000 +0100 +++ new/usr/lib/X11/displaymanagers/lxdm.fallback 2011-09-06 13:30:42.000000000 +0200 @@ -0,0 +1,19 @@ +lxdm_start_proc() { + xdm_reload_files + return $? +} + +lxdm_vars() { + case $1 in + lxdm|LXDM) + DISPLAYMANAGER=/usr/bin/lxdm + XDMOPTIONS=-d + STARTPROC=lxdm_start_proc + RELOADPROC=lxdm_start_proc + ;; + *) + return 1 + ;; + esac + return 0 +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usr/lib/X11/displaymanagers/slim.fallback new/usr/lib/X11/displaymanagers/slim.fallback --- old/usr/lib/X11/displaymanagers/slim.fallback 1970-01-01 01:00:00.000000000 +0100 +++ new/usr/lib/X11/displaymanagers/slim.fallback 2011-09-06 13:35:42.000000000 +0200 @@ -0,0 +1,20 @@ +slimdm_start_proc() { + xdm_reload_files + return $? +} + +slimdm_vars() { + case $1 in + slim|SLIM) + DISPLAYMANAGER=/usr/bin/slim + PIDFILE=/var/run/slim.lock + XDMOPTIONS=-d + STARTPROC=slimdm_start_proc + RELOADPROC=slimdm_start_proc + ;; + *) + return 1 + ;; + esac + return 0 +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usr/lib/X11/displaymanagers/wdm.fallback new/usr/lib/X11/displaymanagers/wdm.fallback --- old/usr/lib/X11/displaymanagers/wdm.fallback 1970-01-01 01:00:00.000000000 +0100 +++ new/usr/lib/X11/displaymanagers/wdm.fallback 2011-09-20 15:43:23.000000000 +0200 @@ -0,0 +1,21 @@ +wdm_start_proc () { + xdm_reload_files + return $? +} + +wdm_vars() { + WDM_BIN=/usr/bin/wdm + + case "${DISPLAYMANAGER##*/}" in + wdm|WDM) + DISPLAYMANAGER=$WDM_BIN + STARTPROC=wdm_start_proc + ;; + *) + return 1 ;; + esac + + return 0 +} + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usr/lib/X11/displaymanagers/xdm new/usr/lib/X11/displaymanagers/xdm --- old/usr/lib/X11/displaymanagers/xdm 1970-01-01 01:00:00.000000000 +0100 +++ new/usr/lib/X11/displaymanagers/xdm 2011-08-25 12:11:44.000000000 +0200 @@ -0,0 +1,28 @@ +xdm_start_proc() { + xdm_reload_files + return $? +} + +xdm_probe_proc() { + if test $XDMDIR/xdm-config -nt $PIDFILE -o \ + $XDMDIR/Xservers -nt $PIDFILE + then + echo reload + fi + return 0 +} + +xdm_vars() { + + case "$1" in + xdm) + DISPLAYMANAGER=/usr/bin/xdm + STARTPROC=xdm_start_proc + RELOADPROC=xdm_start_proc # same as startproc! + PROBEPROC=xdm_probe_proc + ;; + *) + return 1 ;; + esac + return 0 +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
