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

1 files changed, 0 insertions, 109 deletions

diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index d2eb79b7..22e313f8 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -922,103 +922,6 @@ include_in_fsroot_union () {
  done
 }
 
-# deprecated, moved to "desktop" plugin! Some of the preparations should
-# be moved to the respective "desktop.sh" script to be defined in <distro>.pm
-# kdmrc template started from distro specific functions files
-config_kdm_template () {
-testmkd /mnt/${D_KDMRCPATH}
-testmkd /mnt/var/lib/openslx/themes/displaymanager
-# check if a kdmrc was provided via ConfTGZ
-[ -f /rootfs/${D_KDMRCPATH}/kdmrc ] || \
-  echo -e "# ${D_KDMRCPATH}/kdmrc - \
-file generated by
-#\t$0: $date\n\
-[General]
-ConfigVersion=2.3
-StaticServers=:0
-ExportList=LANG
-PidFile=/var/run/kdm.pid
-AuthDir=/var/lib/xdm/authdir/authfiles
-ServerVTs=-7
-ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6
-[Xdmcp]
-Enable=$xdmcp
-Xaccess=/${D_XDMPATH}/Xaccess
-Willing=/${D_XDMPATH}/Xwilling
-[Shutdown]
-HaltCmd=/sbin/halt
-RebootCmd=/sbin/reboot
-[X-*-Core]
-ServerCmd=${D_XORGBIN} -br
-ServerArgsLocal=-nolisten tcp
-TerminateServer=true
-Resources=/${D_XDMPATH}/Xresources
-Setup=/${D_XDMPATH}/Xsetup
-UserPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/var/X11R6/bin
-SystemPath=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:\
-/usr/X11R6/bin:/var/X11R6/bin
-Startup=/${D_XDMPATH}/Xstartup
-Reset=/${D_XDMPATH}/Xreset
-Session=/${D_XDMPATH}/Xsession
-ClientLogFile=.xsession-errors-%s
-AutoReLogin=false
-AllowRootLogin=true
-AllowNullPasswd=true
-AllowShutdown=All
-SessionsDirs=/etc/X11/sessions,/usr/share/xsessions
-AuthNames=XDM-AUTHORIZATION-1,MIT-MAGIC-COOKIE-1
-[X-*-Greeter]
-ShowUsers=Selected
-SelectedUsers=
-UserList=false
-GUIStyle=default
-LogoArea=Clock
-GreetString=Diskless Linux (%h)
-GreetFont=Nimbus Sans l,20,-1,5,48,0,0,0,0,0
-StdFont=Nimbus Sans l,14,-1,5,48,0,0,0,0,0
-FailFont=Nimbus Sans l,14,-1,5,74,0,0,0,0,0
-AntiAliasing=true
-Language=$lang
-EchoMode=OneStar
-ShowLog=false
-UseTheme=false
-Theme=/var/lib/openslx/themes/displaymanager/kdm
-UseBackground=true
-BackgroundCfg=/var/lib/openslx/themes/displaymanager/backgroundrc
-[X-:*-Greeter]
-PreselectUser=None
-FocusPasswd=true
-LoginMode=DefaultLocal
-AllowClose=false
-UseAdminSession=true
-[X-:0-Core]
-AutoLoginEnable=false
-ClientLogFile=.xsession-errors
-NoPassEnable=false
-[X-:0-Greeter]
-LogSource=/dev/xconsole
-UseAdminSession=false" >/mnt/${D_KDMRCPATH}/kdmrc
-echo -e "[Desktop0]
-BackgroundMode=Flat
-BlendBalance=100
-BlendMode=NoBlending
-ChangeInterval=60
-Color1=0,51,102
-Color2=255,255,255
-CurrentWallpaper=0
-LastChange=0
-MinOptimizationDepth=1
-MultiWallpaperMode=NoMulti
-Pattern=triangles
-Program=
-ReverseBlending=false
-UseSHM=false
-Wallpaper=
-WallpaperList=
-WallpaperMode=NoWallpaper" \
-  >/mnt/var/lib/openslx/themes/displaymanager/backgroundrc
-}
-
 #############################################################################
 # dummy functions - avoid undefined functions in servconfig (functions are
 # normally overwritten by settings within distro-functions) - a file 
@@ -1069,18 +972,6 @@ consolefont () {
 config_acpi () {
 :
 }
-# configure xdm as display manager
-config_xdm () {
-:
-}
-# configure kdm as display manager
-config_kdm () {
-:
-}
-# configure gdm as display manager
-config_gdm () {
-:
-}
 # configure hal, dbus, resmgr and services like that
 config_dreshal () {
 :