Removed all kdm/gdm/xdm and most of X configuration. Before altering these file this step should be testet, so that painfull merging can be avoided. The files in initramfs/distro-specs and initramfs/initrd-stuff should be cleaned. Maybe we should drop support for a few older systems and refer to an older revision. Dhclinet config should be altered or removed since we do not use it anymore. Udhcp should be the default. Example line 267 in initrd-stuff/etc/functions, begins with: "# create configuration file for dhclient."

Removed obsolete theme plugin and the displaymanager themes from the themes dir in the repos. The themes (kdm/gdm) are located in the plugin dir anyway.



git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1831 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 0 insertions, 173 deletions

diff --git a/initramfs/distro-specs/suse/config-default b/initramfs/distro-specs/suse/config-default
index 9187df65..ccd45ac6 100644
--- a/initramfs/distro-specs/suse/config-default
+++ b/initramfs/distro-specs/suse/config-default
@@ -61,7 +61,3 @@ D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
 D_DEFAULTCOUNTRY="de"
 D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng"
 D_BOOTLOCAL="init.d/boot.local"
-# deprecated, moved to "desktop" plugin! Some of the preparations should
-# be moved to the suse "desktop.sh" script to be defined in suse.pm
-D_KDMRCPATH=/etc/opt/kde3/share/config/kdm
-D_XDMPATH=/etc/X11/xdm
diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2
index e9e7258f..983e7ad8 100644
--- a/initramfs/distro-specs/suse/functions-10.2
+++ b/initramfs/distro-specs/suse/functions-10.2
@@ -13,15 +13,6 @@
 # in general SuSE base definitions ...  General changes should be done there,
 # version specific changes for the 10.2 go here.
 
-# display manager configuration
-config_kdm () {
-# use different kdmrc than default, since 10.2 in /opt/kde/...
-echo "XDMOPTIONS=\"-config ${D_KDMRCPATH}/kdmrc\"" \
-  >> /mnt/etc/sysconfig/displaymanager
-config_dm_entry yes
-# write configuration file with general config from /etc/functions
-config_kdm_template
-}
 # configure dbus (inter application communication for kde and gnome), hal
 # (hardware abstraction layer - used e.g. by powersaved), resmgr and 
 # policykitd (resource manager/policykitd - the user gets permissions to 
diff --git a/initramfs/distro-specs/suse/functions-10.3 b/initramfs/distro-specs/suse/functions-10.3
index 68373262..f18f7845 100644
--- a/initramfs/distro-specs/suse/functions-10.3
+++ b/initramfs/distro-specs/suse/functions-10.3
@@ -13,15 +13,6 @@
 # defined in general SuSE base definitions ...  General changes should be done
 # there, version specific changes for the 10.3 go here.
 
-# display manager configuration
-config_kdm () {
-# use different kdmrc than default, since 10.2 in /opt/kde/...
-echo "XDMOPTIONS=\"-config ${D_KDMRCPATH}/kdmrc\"" \
-  >> /mnt/etc/sysconfig/displaymanager
-config_dm_entry yes
-# write configuration file with general config from /etc/functions
-config_kdm_template
-}
 # config nfsv4
 config_nfsv4 () {
 if [ "x$start_nfsv4" = "xyes" ]; then
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 269465b5..c34c4003 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -233,157 +233,6 @@ if [ "$start_samba" != "no" ]; then
         -i /mnt/etc/lisarc
 fi
 }
-# configure X display manager (/etc/${D_SYSCONFDIR}/displaymanager)
-config_dm_entry () {
-local dm="$1"  
-# should be stated that entries were made (fixmee how??)
-# autologin is defined some other way ...
-#    -e "s,.*_AUTOLOGIN.*,DISPLAYMANAGER_AUTOLOGIN=\"\"," \
-sed -e "s,DISPLAYMANAGER=.*,DISPLAYMANAGER=\"$start_xdmcp\"," \
-    -e "s,.*_XSERVER.*,DISPLAYMANAGER_STARTS_XSERVER=\"$dm\"," \
-    -i /mnt/etc/${D_SYSCONFDIR}/displaymanager
-# start the display manager as early as possible in runlevel 5
-ln -sf ../xdm /mnt/etc/${D_INITDIR}/rc5.d/S01xdm
-ln -sf ../xdm /mnt/etc/${D_INITDIR}/rc5.d/K18xdm
-sed -e "s,xdm: .*,xdm:," -i /mnt/etc/${D_INITDIR}/.depend.start
-}
-# configure X display manager (runlevel links and kind of manager)
-config_xdm () {
-config_dm_entry yes
-}
-# configure gdm as display manager
-config_gdm () {
-config_dm_entry yes
-testmkd /mnt/var/lib/gdm
-testmkd /mnt/var/log/gdm
-strinfile "gdm:" /mnt/etc/passwd || echo "gdm:x:50:15:Gnome Display Manager \
-Daemon:/var/lib/gdm:/bin/false" >>/mnt/etc/passwd
-# hack - gdm should be user 50 and shadow group 15
-chown 50:15 /mnt/var/lib/gdm /mnt/var/log/gdm
-chmod 0750 /mnt/var/lib/gdm /mnt/var/log/gdm
-xdmcp_hosts=`echo $x_display_manager|sed -e "s; ;,;"`
-if [ "${DEBUGLEVEL}" -gt 0 ] ; then
-  local debug="true"
-else
-  local debug="false"
-fi
-# check if a gdm.conf was provided via ConfTGZ
-if [ ! -f /etc/opt/gnome/gdm/gdm.conf ] ; then
-  echo -e "# /etc/opt/gnome/gdm/gdm.conf - file generated by $0\n\
-[daemon]
-AutomaticLoginEnable=false
-TimedLoginEnable=false
-#AlwaysRestartServer=false
-Chooser=/opt/gnome/lib/gdm/gdmchooser
-Greeter=/opt/gnome/lib/gdm/gdmgreeter
-RemoteGreeter=/opt/gnome/lib/gdm/gdmgreeter
-DefaultPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/games:/opt/bin:\
-/opt/gnome/bin:/opt/kde3/bin:/opt/kde/bin:/usr/openwin/bin
-RootPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/local/bin:/usr/bin:\
-/usr/X11R6/bin:/bin:/usr/games:/opt/bin:/opt/gnome/bin:/opt/kde3/bin:\
-/opt/kde/bin:/usr/openwin/bin:/opt/cross/bin
-User=gdm
-Group=shadow
-#KillInitClients=true
-LogDir=/var/lib/gdm
-ServAuthDir=/var/lib/gdm
-PostLoginScriptDir=/etc/opt/gnome/gdm/PostLogin/
-PreSessionScriptDir=/etc/opt/gnome/gdm/PreSession/
-PostSessionScriptDir=/etc/opt/gnome/gdm/PostSession/
-DisplayInitDir=/etc/opt/gnome/gdm/Init
-XKeepsCrashing=/etc/opt/gnome/gdm/XKeepsCrashing
-RebootCommand=/sbin/shutdown -r now
-HaltCommand=/sbin/shutdown -h now
-SuspendCommand=/usr/bin/powersave --suspend-to-disk
-BaseXsession=/etc/opt/gnome/gdm/Xsession
-SessionDesktopDir=/usr/share/xsessions/:/etc/X11/sessions/:\
-/etc/opt/gnome/dm/Sessions/:/opt/gnome/share/gdm/BuiltInSessions/:\
-$vmsessions
-BaseXsession=/etc/opt/gnome/gdm/Xsession
-UserAuthFBDir=/tmp
-UserAuthFile=.Xauthority
-StandardXServer=${D_XORGBIN} +kb -I
-Xnest=/usr/X11R6/bin/Xnest -audit 0 -name Xnest
-
-[security]
-AllowRoot=true
-AllowRemoteRoot=true
-AllowRemoteAutoLogin=false
-CheckDirOwner=true
-#UserMaxFile=65536
-RetryDelay=1
-#SessionMaxFile=524388
-NeverPlaceCookiesOnNFS=true
-
-[xdmcp]
-Enable=$xdmcp
-HonorIndirect=true
-MaxPending=4
-MaxPendingIndirect=4
-MaxSessions=10
-MaxWait=15
-MaxWaitIndirect=15
-DisplaysPerHost=2
-Willing=/etc/X11/xdm/Xwilling
-
-[gui]
-#MaxIconWidth=128
-#MaxIconWidth=128
-
-[greeter]
-Browser=false
-#TitleBar=true
-MinimalUID=500
-Quiver=true
-Welcome=Welcome to %n
-LockPosition=true
-BackgroundImage=0
-BackgroundColor=#000000
-ShowGnomeFailsafeSession=false
-ShowXtermFailsafeSession=false
-ShowLastSession=false
-Use24Clock=true
-GraphicalTheme=GDM-SuSE
-GraphicalTheme=circles
-GraphicalThemeDir=/opt/gnome/share/gdm/themes/
-GraphicalThemeRand=false
-#SystemMenu=true
-InfoMsgFile=/opt/gnome/share/gdm/UserInfo
-InfoMsgFont=monospace 10
-SoundOnLogin=false
-[chooser]
-HostImageDir=/opt/gnome/share/hosts/
-Broadcast=false
-Multicast=false
-Hosts=$xdmcp_hosts
-
-[debug]
-Enable=$debug" >/mnt/etc/opt/gnome/gdm/gdm.conf
-  if [ "x$start_x" = "xindirect" ] ; then
-    # when X server consumes to much mem set X -terminate
-    echo -e "\n[servers]\n0=Terminal -audit 0 -indirect \
-$host_name\n\n\
-[server-Terminal]\nname=Terminal server\ncommand=/usr/X11R6/bin/X \
--audit 0\n\
-flexible=true\nhandled=true\nchooser=true" >>/mnt/etc/opt/gnome/gdm/gdm.conf
-  else
-    if [ ! -d /mnt/etc/opt/gnome/gdm ] ; then
-       testmkd /mnt/etc/opt/gnome/gdm 
-    fi
-    echo -e "\n[servers]\n0=Standard\n\n\
-[server-Standard]\nname=Standard server\ncommand=/usr/X11R6/bin/X\n\
-flexible=true\nhandled=true" >>/mnt/etc/opt/gnome/gdm/gdm.conf
-  fi
-fi
-}
-# configure kdm as display manager
-config_kdm () {
-config_dm_entry yes
-# write configuration file
-# use general config in /etc/functions
-config_kdm_template
-}
-
 # configure bluetooth services
 config_bt () {
 if [ -e /mnt/etc/${D_SYSCONFDIR}/bluetooth ] ; then