Hello community,
here is the log from the commit of package aaa_base
checked in at Fri Sep 1 01:18:49 CEST 2006.
--------
--- aaa_base/aaa_base.changes 2006-08-29 17:13:07.000000000 +0200
+++ aaa_base/aaa_base.changes 2006-08-31 21:56:00.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 31 21:55:18 CEST 2006 - sndirsch@suse.de
+
+- moved xdm init script and displaymanger sysconfig to xorg-x11
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.8BvAik/_old 2006-09-01 01:17:38.000000000 +0200
+++ /var/tmp/diff_new_pack.8BvAik/_new 2006-09-01 01:17:38.000000000 +0200
@@ -19,7 +19,7 @@
PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools
Autoreqprov: on
Version: 10.2
-Release: 6
+Release: 7
Summary: SUSE Linux Base Package
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: aaa_base.tar.bz2
@@ -88,9 +88,6 @@
# reset mail level
sed -i -e "s/^MAIL_LEVEL=.*/MAIL_LEVEL=\"warn\"/" \
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.suseconfig
- # require root password for shutdown
- #sed -i -e "s/^DISPLAYMANAGER_SHUTDOWN=.*/DISPLAYMANAGER_SHUTDOWN=\"root\"/" \
- # $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.displaymanager
%endif
#
## do SLES specific settings END
@@ -148,6 +145,8 @@
%defattr(-,root,root)
%changelog -n aaa_base
+* Thu Aug 31 2006 - sndirsch@suse.de
+- moved xdm init script and displaymanger sysconfig to xorg-x11
* Tue Aug 29 2006 - ro@suse.de
- removed ash from requires (old for mkinitrd) (#202074)
- added net-tools to requires (for boot.localnet) (#202078)
++++++ aaa_base.post ++++++
--- aaa_base/aaa_base.post 2006-08-07 14:46:14.000000000 +0200
+++ aaa_base/aaa_base.post 2006-08-31 21:46:05.000000000 +0200
@@ -89,7 +89,7 @@
#
# Initialize runlevel links
#
-%{fillup_and_insserv -py boot.proc boot.localfs boot.swap boot.clock boot.ldconfig boot.ipconfig boot.klog boot.localnet halt random reboot single xdm nfs}
+%{fillup_and_insserv -py boot.proc boot.localfs boot.swap boot.clock boot.ldconfig boot.ipconfig boot.klog boot.localnet halt random reboot single nfs}
%{fillup_and_insserv -psy boot.crypto START_CRYPTO_FILESYSTEMS}
%{insserv_force_if_yast etc/init.d/boot.loadmodules etc/init.d/boot.cleanup etc/init.d/boot.rootfsck}
## powerfail probably needs empty header ...
@@ -109,7 +109,6 @@
fi
%{remove_and_set -n security CONSOLE_SHUTDOWN}
%{remove_and_set -n suseconfig CHECK_INITTAB}
-%{remove_and_set -n displaymanager KDM_SHUTDOWN}
%{remove_and_set -n suseconfig HALT_SOUND}
if ! [ -d etc/sysconfig ] ; then
@@ -119,20 +118,11 @@
if [ ! -f etc/sysconfig/language -a -f etc/rc.config.d/lang.rc.config ] ; then
mv etc/rc.config.d/lang.rc.config etc/sysconfig/language
fi
-for i in language backup boot displaymanager kernel \
+for i in language backup boot kernel \
suseconfig clock proxy windowmanager sysctl mail \
cron news shutdown ; do
%{fillup_only -n $i}
done
-# migrate KDM_SHUTDOWN value if set before
-if [ -n "$KDM_SHUTDOWN" -a "$KDM_SHUTDOWN" != "no" ] ; then
- if [ "$KDM_SHUTDOWN" = "local" ] ; then
- KDM_SHUTDOWN=all
- fi
- sed -e "s|^DISPLAYMANAGER_SHUTDOWN=.*|DISPLAYMANAGER_SHUTDOWN=\"$KDM_SHUTDOWN\"|" \
- etc/sysconfig/displaymanager > etc/sysconfig/displaymanager.new \
- && mv etc/sysconfig/displaymanager.new etc/sysconfig/displaymanager
-fi
# migrate HALT_SOUND value if set before
if [ -n "$HALT_SOUND" -a "$HALT_SOUND" != "no" ] ; then
sed -e "s|^HALT_SOUND=.*|HALT_SOUND=\"$HALT_SOUND\"|" \
++++++ aaa_base.specialfilelist ++++++
--- aaa_base/aaa_base.specialfilelist 2005-09-01 15:20:14.000000000 +0200
+++ aaa_base/aaa_base.specialfilelist 2006-08-31 21:43:35.000000000 +0200
@@ -33,7 +33,6 @@
%config /etc/init.d/routed
%config /etc/init.d/serial
%config /etc/init.d/single
-%config /etc/init.d/xdm
%config /sbin/quick_halt
%ghost /var/adm/fillup-templates/passwd.aaa_base
%ghost /var/adm/fillup-templates/group.aaa_base
++++++ aaa_base.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/xdm new/aaa_base/etc/init.d/xdm
--- old/aaa_base/etc/init.d/xdm 2006-08-19 11:46:55.000000000 +0200
+++ new/aaa_base/etc/init.d/xdm 1970-01-01 01:00:00.000000000 +0100
@@ -1,184 +0,0 @@
-#! /bin/bash
-# Copyright (c) 1996-2002 SuSE Linux AG, Nuernberg, Germany.
-# All rights reserved.
-#
-# Author: Florian La Roche, 1996
-# Werner Fink , 1996,98,99
-# Martin Scherbaum, 1997
-# Reinhard Max , 1997
-#
-# Please send feedback to http://www.suse.de/feedback
-#
-# /etc/init.d/xdm
-#
-### BEGIN INIT INFO
-# Provides: xdm
-# Required-Start: $remote_fs
-# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlykdm
-# Required-Stop:
-# Default-Start: 5
-# Default-Stop:
-# Description: X Display Manager
-### END INIT INFO
-
-. /etc/rc.status
-. /etc/sysconfig/displaymanager
-. /etc/sysconfig/language
-. /etc/sysconfig/windowmanager
-test -e /etc/SuSEconfig/profile && . /etc/SuSEconfig/profile
-test -r /etc/profile.d/desktop-data.sh && . /etc/profile.d/desktop-data.sh
-
-locale_vars=" \
-LANG \
-LC_CTYPE \
-LC_NUMERIC \
-LC_TIME \
-LC_COLLATE \
-LC_MONETARY \
-LC_MESSAGES \
-LC_PAPER \
-LC_NAME \
-LC_ADDRESS \
-LC_TELEPHONE \
-LC_MEASUREMENT \
-LC_IDENTIFICATION \
-LC_ALL"
-
-unset LC_ALL
-for lc in $locale_vars
-do
- eval val="\$RC_$lc"
- if test -n "$val"; then
- eval $lc="\$RC_$lc"
- export $lc
- fi
-done
-unset lc val
-
-test -z "$DEFAULT_WM" && DEFAULT_WM=twm
-SAVEPATH=$PATH
-PATH=$PATH:/usr/X11R6/bin:/opt/gnome/bin:/usr/openwin/bin
-WINDOWMANAGER="`type -p ${DEFAULT_WM##*/}`"
-PATH=$SAVEPATH
-export WINDOWMANAGER
-unset DEFAULT_WM SAVEPATH
-
-PIDFILE="/var/run/xdm.pid"
-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
-
-
-case "${DISPLAYMANAGER##*/}" in
- kdm|kde|KDM|KDE) DISPLAYMANAGER=/opt/kde3/bin/kdm
- PIDFILE="/var/run/kdm.pid"
- ;;
- xdm) DISPLAYMANAGER=$XDM_BIN
- ;;
- gdm|GDM|Gnome|GNOME) DISPLAYMANAGER=/opt/gnome/sbin/gdm
- PIDFILE="/var/run/gdm.pid"
- ;;
- wdm|WDM) DISPLAYMANAGER=/usr/X11R6/bin/wdm
- ;;
- console) exit 0
- ;;
- *) DISPLAYMANAGER=$XDM_BIN
- if test -x /opt/kde3/bin/kdm; then
- DISPLAYMANAGER=/opt/kde3/bin/kdm
- PIDFILE="/var/run/kdm.pid"
- fi
- ;;
-esac
-test ! -x "$DISPLAYMANAGER" && DISPLAYMANAGER=$XDM_BIN
-
-DM=${DISPLAYMANAGER##*/}
-
-rc_reset
-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
- rc_exit 0
- fi
-
- test -x /etc/X11/xdm/SuSEconfig.xdm && /etc/X11/xdm/SuSEconfig.xdm
-
- 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
- rc_status -u
- rc_exit
- fi
- if [ "$DISPLAYMANAGER" = "/opt/gnome/sbin/gdm" -a \
- "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" -a \
- "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ]; then
- XDMOPTIONS="--no-console"
- 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
- if rc_status ; then
- if test -x $XDMDIR/TakeDevices ; then
- $XDMDIR/TakeDevices
- else
- chown root:tty /dev/xconsole /dev/tty0
- chmod 622 /dev/xconsole /dev/tty0
- fi
- fi
- rc_status -v
- ;;
- stop)
- 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
- ;;
- restart)
- $0 stop
- $0 start
- rc_status
- ;;
- reload|force-reload)
- test -x /etc/X11/xdm/SuSEconfig.xdm && /etc/X11/xdm/SuSEconfig.xdm
- echo -n "Reload service $DM"
- killproc -p $PIDFILE -HUP $DISPLAYMANAGER
- rc_status -v
- ;;
- status|check)
- echo -n "Checking for service ${DM}: "
- checkproc -p $PIDFILE $DISPLAYMANAGER
- rc_status -v
- ;;
- probe)
- if test $XDMDIR/xdm-config -nt $PIDFILE -o \
- $XDMDIR/Xservers -nt $PIDFILE
- then
- echo reload
- fi
- ;;
- try-restart|condrestart)
- $0 status
- if test $? = 0; then
- $0 restart
- else
- rc_reset
- fi
- rc_status
- ;;
- *)
- echo "Usage: $0 {start|stop|status|restart|reload|force-reload|probe|try-restart}"
- exit 1
-esac
-rc_exit
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/usr/sbin/rcxdm new/aaa_base/usr/sbin/rcxdm
--- old/aaa_base/usr/sbin/rcxdm 2006-09-01 01:17:38.000000000 +0200
+++ new/aaa_base/usr/sbin/rcxdm 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-symbolic link to /etc/init.d/xdm
++++++ arch_special.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/arch_special/s390/sysconfig-displaymanager.diff new/arch_special/s390/sysconfig-displaymanager.diff
--- old/arch_special/s390/sysconfig-displaymanager.diff 2004-04-28 20:01:04.000000000 +0200
+++ new/arch_special/s390/sysconfig-displaymanager.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
---- var/adm/fillup-templates/sysconfig.displaymanager
-+++ var/adm/fillup-templates/sysconfig.displaymanager
-@@ -18,1 +18,1 @@
--DISPLAYMANAGER_REMOTE_ACCESS="no"
-+DISPLAYMANAGER_REMOTE_ACCESS="yes"
-@@ -34,1 +34,1 @@
--DISPLAYMANAGER_STARTS_XSERVER="yes"
-+DISPLAYMANAGER_STARTS_XSERVER="no"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/arch_special/s390x/sysconfig-displaymanager.diff new/arch_special/s390x/sysconfig-displaymanager.diff
--- old/arch_special/s390x/sysconfig-displaymanager.diff 2006-09-01 01:17:39.000000000 +0200
+++ new/arch_special/s390x/sysconfig-displaymanager.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-symbolic link to ../s390/sysconfig-displaymanager.diff
++++++ sysconfig_parts.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig_parts/sysconfig.displaymanager new/sysconfig_parts/sysconfig.displaymanager
--- old/sysconfig_parts/sysconfig.displaymanager 2006-05-10 10:50:53.000000000 +0200
+++ new/sysconfig_parts/sysconfig.displaymanager 1970-01-01 01:00:00.000000000 +0100
@@ -1,87 +0,0 @@
-## Path: Desktop/Display manager
-## Description: settings to generate a proper displaymanager config
-## Config: xdm,kdm,gdm
-
-## Type: string(kdm,xdm,gdm,wdm,console)
-## Default: ""
-#
-# Here you can set the default Display manager (kdm/xdm/gdm/wdm/console).
-# all changes in this file require a restart of the displaymanager
-#
-DISPLAYMANAGER=""
-
-## Type: yesno
-## Default: no
-#
-# Allow remote access (XDMCP) to your display manager (xdm/kdm/gdm). Please note
-# that a modified kdm or xdm configuration, e.g. by KDE control center
-# will not be changed. For gdm, values will be updated after change.
-# XDMCP service should run only on trusted networks and you have to disable
-# firewall for interfaces, where you want to provide this service.
-#
-DISPLAYMANAGER_REMOTE_ACCESS="no"
-
-## Type: yesno
-## Default: no
-#
-# Allow remote access of the user root to your display manager. Note
-# that root can never login if DISPLAYMANAGER_SHUTDOWN is "auto" and
-# System/Security/Permissions/PERMISSION_SECURITY is "paranoid"
-#
-DISPLAYMANAGER_ROOT_LOGIN_REMOTE="no"
-
-## Type: yesno
-## Default: yes
-#
-# Let the displaymanager start a local Xserver.
-# Set to "no" for remote-access only.
-# Set to "no" on architectures without any Xserver (e.g. s390/s390x).
-#
-DISPLAYMANAGER_STARTS_XSERVER="yes"
-
-## Type: yesno
-## Default: no
-#
-# TCP port 6000 of Xserver. When set to "no" (default) Xserver is
-# started with "-nolisten tcp". Only set this to "yes" if you really
-# need to. Remote X service should run only on trusted networks and
-# you have to disable firewall for interfaces, where you want to
-# provide this service. Use ssh X11 port forwarding whenever possible.
-#
-DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN="no"
-
-## Type: string
-## Default:
-#
-# Define the user whom should get logged in without request. If string
-# is empty, display standard login dialog.
-#
-DISPLAYMANAGER_AUTOLOGIN=""
-
-## Type: yesno
-## Default: no
-#
-# Allow all users to login without password, but ask for the user, if
-# DISPLAYMANAGER_AUTOLOGIN is empty.
-#
-DISPLAYMANAGER_PASSWORD_LESS_LOGIN="no"
-
-## Type: yesno
-## Default: no
-#
-# Display a combobox for Active Directory domains.
-#
-DISPLAYMANAGER_AD_INTEGRATION="no"
-
-## Type: list(root,all,none,auto)
-## Default: auto
-#
-# Determine who will be able to shutdown or reboot the system in kdm
-# and gdm. Valid values are: "root" (only root can shutdown), "all"
-# (everybody can shutdown), "none" (nobody can shutdown from
-# displaymanager), "auto" (follow
-# System/Security/Permissions/PERMISSION_SECURITY to decide: "easy
-# local" is equal to "all", everything else is equal to "root"). Note
-# that remote user can never shutdown in GDM.
-#
-DISPLAYMANAGER_SHUTDOWN="auto"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org