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

17 files changed, 0 insertions, 1113 deletions

diff --git a/initramfs/distro-specs/debian/config-default b/initramfs/distro-specs/debian/config-default
index 8e3f5cd5..0eb8d668 100644
--- a/initramfs/distro-specs/debian/config-default
+++ b/initramfs/distro-specs/debian/config-default
@@ -55,7 +55,3 @@ D_XF86CONFFILE="/etc/X11/xorg.conf"
 D_XORGBIN=/usr/X11R6/bin/X
 D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
 D_DEFAULTCOUNTRY="de"
-# deprecated, moved to "desktop" plugin! Some of the preparations should
-# be moved to the debian "desktop.sh" script to be defined in debian.pm
-D_KDMRCPATH=/etc/kde3/kdm
-D_XDMPATH=/etc/kde3/kdm
diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default
index 67e613c2..52d4fea9 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -143,15 +143,6 @@ if [ "x$start_snmp" = "xyes" ] ; then
   fi
 }
 
-# x11 stuff
-descsession () {
-# variable desktop_session is most probably deprecated in near future
-if [ "x$desktop_session" != "x" ] ; then
-  windowmanagers="$desktop_session"
-else
-  windowmanagers="kde,gnome,icewm,failsafe"
-fi
-
 # add special path /var/X11R6/bin to the PATH variable
 # fixme!! add path directly to /etc/profile!?
 #[ "x$addpath" != "x" ] && \
@@ -173,36 +164,6 @@ sed -e "s,LANG=.*,LANG=\"${LANG}\" # set within initramfs," \
     -i /mnt/etc/default/locale
 }
 
-# deprecated, moved to "desktop" plugin! Some of the preparations should
-# be moved to the ubuntu "desktop.sh" script to be defined in debian.pm
-# configure gdm as display manager
-config_gdm () {
-ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/K20gdm
-ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/S01gdm
-# check for gdm user in passwd file and add it if not present
-if ! grep "gdm:" /mnt/etc/passwd >/dev/null 2>&1; then
-  echo "gdm:x:113:">>/mnt/etc/group
-  echo "gdm:x:106:113:Gnome Display Manager:/var/lib/gdm:/bin/false" \
-    >>/mnt/etc/passwd
-fi
-# fixme: any directory with certain permissions needed?
-# testmkd /mnt/var/lib/gdm/.fontconfig
-# echo -e "\tchown gdm:gdm /var/lib/gdm/.fontconfig\n\t\chown root:gdm \
-#/var/lib/gdm" >> /mnt/etc/${D_INITDIR}/boot.slx
-}
-
-# same as for gdm ...
-# configure kdm as display manager
-config_kdm () {
-# first define directories for kdm
-ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm
-ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/S20kdm
-
-# write configuration file
-# use general config in /etc/functions
-config_kdm_template
-}
-
 # configure hal, dbus, resmgr and services like that
 config_dreshal () {
 if [ "x$start_dreshal" = "xyes" ]; then
diff --git a/initramfs/distro-specs/gentoo/config-default b/initramfs/distro-specs/gentoo/config-default
index 13927a6f..38928300 100644
--- a/initramfs/distro-specs/gentoo/config-default
+++ b/initramfs/distro-specs/gentoo/config-default
@@ -49,8 +49,3 @@ D_XFONTPATH="/usr/share/fonts/*"
 D_DEFAULTCOUNTRY="de"
 D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng"
 D_BOOTLOCAL="conf.d/local.start"
-
-# deprecated, moved to "desktop" plugin! Some of the preparations should
-# be moved to the gentoo "desktop.sh" script to be defined in gentoo.pm
-D_KDMRCPATH=/var/lib/openslx/themes/displaymanager
-D_XDMPATH=/etc/X11/kdm
diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default
index a9da16fe..988e7412 100644
--- a/initramfs/distro-specs/gentoo/functions-default
+++ b/initramfs/distro-specs/gentoo/functions-default
@@ -236,145 +236,6 @@ local file=$3
 sed -e "s,$var=.*,$var=\"$value\"," -i /mnt/etc/${file}
 }
 
-# general display manager stuff like runlevel link and config file entry
-config_dm_entry () {
-local displmng=$1
-if [ -f /mnt/etc/${D_INITDIR}/xdm ] ; then
-  config_rc_entry "DISPLAYMANAGER" "${displmng}"
-  rllinker xdm
-else
-  error "" nonfatal
-fi
-}
-
-
-# configure X display manager (runlevel links and kind of manager)
-config_xdm () {
-# runlevel and config stuff
-config_dm_entry xdm
-}
-
-# configure gdm
-config_gdm () {
-# runlevel stuff
-config_dm_entry gdm
-# fixme!! check for needed directories and permissions
-#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
-}
-
-# configure kdm as display manager
-config_kdm () {
-config_dm_entry kdm
-
-# setting the path for kdmrc-file 
-# FIXME: hack - there is no other way in gentoo?!? Why the hell in "themes"
-# directory??
-sed -e 's,\(PIDFILE:.*\)|| \\$,\1 -- -config \${D_KDMRCPATH}/kdmrc || \\,g'\
-    -i /mnt/etc/X11/startDM.sh
-
-# write configuration file - NOT using general config in /etc/functions
-##config_kdm_template
-
-usetheme=false
-themeconf=$(ls /mnt/${D_KDMRCPATH}/*.xml 2>/dev/null)
-[ -r "${themeconf}" ] && usetheme=true
-# 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
-ReserveServers=:1,:2,:3
-ServerVTs=-7
-ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6
-PidFile=/var/run/kdm.pid
-[Xdmcp]
-Enable=false
-Willing=/usr/kde/3.5/share/config/kdm/Xwilling
-[Shutdown]
-[X-*-Core]
-ServerCmd=${D_XORGBIN} -br
-Setup=/usr/kde/3.5/share/config/kdm/Xsetup
-Startup=/usr/kde/3.5/share/config/kdm/Xstartup
-Reset=/usr/kde/3.5/share/config/kdm/Xreset
-Session=/usr/kde/3.5/share/config/kdm/Xsession
-AllowRootLogin=true
-AllowNullPasswd=false
-AllowShutdown=Root
-SessionsDirs=/etc/X11/Sessions,/usr/share/xsessions
-ClientLogFile=.xsession-errors-%s
-[X-*-Greeter]
-LogoArea=Logo
-LogoPixmap=/usr/kde/3.5/share/apps/kdm/pics/kdelogo.png
-MinShowUID=1000
-MaxShowUID=65000
-ForgingSeed=1165509407
-Preloader=/usr/kde/3.5/bin/preloadkde
-Theme=/var/lib/openslx/themes/displaymanager
-UseBackground=true
-BackgroundCfg=/var/lib/openslx/themes/displaymanager/backgroundrc
-[X-:*-Core]
-ServerCmd=/usr/bin/X -br
-ServerArgsLocal=-nolisten tcp
-AllowNullPasswd=true
-AllowShutdown=All
-[X-:*-Greeter]
-PreselectUser=Previous
-FocusPasswd=true
-LoginMode=DefaultLocal
-AllowClose=false
-[X-:0-Core]
-ClientLogFile=.xsession-errors
-[X-:0-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" >/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
-
-
-
-#Gentoo specifics??
-#sed -e 's,\(save_options .*\)"$,\1 -- -config ${D_KDMRCPATH}/kdmrc",g'\
-#    -i /mnt/etc/init.d/xdm
-#sed -e "s,\(ServerCmd=\).*,\1${D_XORGBIN} -br,g"\
-#    -e "s,ShowLog=false,,g"\
-#    -e "s,LogSource=false,,g"\
-#    -e "s,UseAdminSession=.*,,g"\
-#    -e "s,\(Startup=\).*$,\1/etc/X11/Sessions/Xsession,g"\
-#    -i /mnt/${D_KDMRCPATH}/kdmrc
-
-}
-
 # configure bluetooth services
 config_bt () {
 if [ -f /mnt/etc/init.d/bluetooth ] ; then
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
diff --git a/initramfs/distro-specs/ubuntu/config-default b/initramfs/distro-specs/ubuntu/config-default
index 4f74f23c..246192f6 100644
--- a/initramfs/distro-specs/ubuntu/config-default
+++ b/initramfs/distro-specs/ubuntu/config-default
@@ -63,8 +63,3 @@ D_XORGBIN=/usr/X11R6/bin/X
 D_XFONTPATH="/usr/share/fonts/*"
 D_DEFAULTCOUNTRY="de"
 D_BOOTLOCAL=""
-
-# deprecated, moved to "desktop" plugin! Some of the preparations should
-# be moved to the ubuntu "desktop.sh" script to be defined in ubuntu.pm
-D_KDMRCPATH=/etc/kde3/kdm
-D_XDMPATH=/etc/kde3/kdm
diff --git a/initramfs/distro-specs/ubuntu/functions-6.06 b/initramfs/distro-specs/ubuntu/functions-6.06
index a8dc3b56..ca9eed98 100644
--- a/initramfs/distro-specs/ubuntu/functions-6.06
+++ b/initramfs/distro-specs/ubuntu/functions-6.06
@@ -23,24 +23,6 @@ preinit () {
   NFSRO=""
 }
 
-# distro specific function called from servconfig script
-
-# x11 stuff
-descsession () {
-# variable desktop_session is most probably deprecated 
-if [ "x$desktop_session" != "x" ] ; then
-  windowmanagers="$desktop_session"
-else
-  windowmanagers="kde,gnome,icewm,failsafe"
-fi
-
-# add special path /var/X11R6/bin to the PATH variable
-# fixme!! add path directly to /etc/profile!?
-#[ "x$addpath" != "x" ] && \
-#  echo -e "# added path component by $0: $date\n\
-#PATH=\"\$PATH:/var/X11R6/bin\"" >>/mnt/etc/profile
-}
-
 # set up keytable (function run in hwautocfg)
 # fixme: is anything needed here - otherwise remove (and check that a 
 # dummy function is present)
diff --git a/initramfs/distro-specs/ubuntu/functions-6.10 b/initramfs/distro-specs/ubuntu/functions-6.10
index 0b5c19c0..76808347 100644
--- a/initramfs/distro-specs/ubuntu/functions-6.10
+++ b/initramfs/distro-specs/ubuntu/functions-6.10
@@ -50,13 +50,3 @@ sed -e "s,LANGUAGE=.*,LANGUAGE=${LANG},;s,LANG=.*,LANG=${LANG}," \
 rllinker "console-screen.sh" 31 3
 }
 
-# configure kdm as display manager
-config_kdm () {
-rllinker "kdm" 3 1
-if [ "x$start_xdmcp" = "xkdm" ]; then 
-  echo /usr/bin/kdm > /mnt/etc/X11/default-display-manager
-fi
-# write configuration file; use general config in /etc/functions
-config_kdm_template
-}
-
diff --git a/initramfs/distro-specs/ubuntu/functions-7.10 b/initramfs/distro-specs/ubuntu/functions-7.10
index e5b73fd2..479b58a0 100644
--- a/initramfs/distro-specs/ubuntu/functions-7.10
+++ b/initramfs/distro-specs/ubuntu/functions-7.10
@@ -33,134 +33,3 @@ config_distro () {
   sed -i "s/start on runlevel 2/start on stopped rc2/" /mnt/etc/event.d/tty1
 }
 
-# configure gdm as display manager
-config_gdm () {
-ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc2.d/K20gdm
-if [ "x$start_xdmcp" = "xgdm" ]; then 
-  #  configure fallback if no gdm binary present
-  if ! binfinder gdm; then
-    config_kdm
-    # error "" nonfatal
-  else
-    echo $(binfinder gdm) > /mnt/etc/X11/default-display-manager
-  fi
-fi
-ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc2.d/S01gdm
-# append gdm user; check for presence first
-if ! grep "gdm:" /mnt/etc/passwd >/dev/null 2>&1; then
-  echo "gdm:x:113:" >>/mnt/etc/group
-  echo "gdm:x:106:113:Gnome Display Manager:/var/lib/gdm:/bin/false" \
-    >>/mnt/etc/passwd
-fi
-testmkd /mnt/var/lib/gdm/.fontconfig
-echo -e "\tchown gdm:gdm /var/lib/gdm/.fontconfig\n\tchown root:gdm \
-/var/lib/gdm\n" >>/mnt/etc/${D_INITDIR}/boot.slx
-# fixme: check if a gdm.conf was provided via ConfTGZ
-# [ -f /rootfs/etc/gdm/gdm.conf ??? ] || \
-echo -e "# /etc/gdm/gdm.conf - file generated by $0\n\
-
-[daemon]
-AutomaticLoginEnable=false
-AutomaticLogin=
-TimedLoginEnable=false
-TimedLogin=
-TimedLoginDelay=30
-Greeter=/usr/lib/gdm/gdmgreeter
-DefaultPath=/usr/local/bin:/usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/games
-RootPath=/usr/local/bin:/usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/games
-User=gdm
-Group=gdm
-LogDir=/var/log/gdm
-PidFile=/var/run/gdm.pid
-PostLoginScriptDir=/etc/gdm/PostLogin/
-PreSessionScriptDir=/etc/gdm/PreSession/
-PostSessionScriptDir=/etc/gdm/PostSession/
-DisplayInitDir=/etc/gdm/Init
-XKeepsCrashing=/etc/gdm/XKeepsCrashing
-RebootCommand=/sbin/shutdown -r now \"Rebooted from gdm menu.\"
-HaltCommand=/sbin/shutdown -h now \"Halted from gdm menu.\"
-SuspendCommand=/usr/sbin/pmi action sleep
-HibernateCommand=/usr/sbin/pmi action hibernate
-ServAuthDir=/var/lib/gdm
-BaseXsession=/etc/gdm/Xsession
-SessionDesktopDir=/etc/X11/sessions/:/etc/dm/Sessions/:/usr/share/gdm/BuiltInSessions/:/usr/share/xsessions/
-DefaultSession=default.desktop
-UserAuthDir=
-UserAuthFBDir=/tmp
-UserAuthFile=.Xauthority
-StandardXServer=${D_XORGBIN}
-Xnest=/usr/X11R6/bin/Xnest -br -audit 0 -name Xnest
-FirstVT=7
-VTAllocation=true
-SoundProgram=/usr/lib/gdmplay
-[security]
-AllowRoot=false
-AllowRemoteRoot=false
-AllowRemoteAutoLogin=false
-RelaxPermissions=0
-CheckDirOwner=true
-DisallowTCP=true
-[xdmcp]
-Enable=false
-[gui]
-GtkTheme=Human
-AllowGtkThemeChange=true
-GtkThemesToAllow=Human,HighContrast,HighContrastInverse,LowContrast
-[greeter]
-ConfigAvailable=false
-Browser=true
-MinimalUID=1000
-Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
-IncludeAll=true
-LocaleFile=/etc/gdm/locale.conf
-SystemMenu=true
-SecureSystemMenu=false
-DefaultWelcome=true
-DefaultRemoteWelcome=true
-BackgroundColor=#523921
-UseCirclesInEntry=true
-GraphicalTheme=Human
-GraphicalThemeDir=/usr/share/gdm/themes/
-GraphicalThemeRand=false
-SoundOnLogin=true
-SoundOnLoginFile=/usr/share/sounds/question.wav
-[chooser]
-HostImageDir=/usr/share/hosts/
-Hosts=
-Broadcast=true
-Multicast=false
-[debug]
-Enable=false
-[servers]
-0=Standard
-[server-Standard]
-name=Standard server
-command=/usr/X11R6/bin/X -br -audit 0 
-flexible=true
-[server-Terminal]
-name=Terminal server
-command=/usr/X11R6/bin/X -br -audit 0 -terminate
-flexible=false
-handled=false
-[server-Chooser]
-name=Chooser server
-command=/usr/X11R6/bin/X -br -audit 0
-flexible=false
-chooser=true
-
-[debug]
-Enable=$debug" >/mnt/etc/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/gdm/gdm.conf
-else
-  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/gdm/gdm.conf
-fi
-}
-
diff --git a/initramfs/distro-specs/ubuntu/functions-8.04 b/initramfs/distro-specs/ubuntu/functions-8.04
index e5b73fd2..479b58a0 100644
--- a/initramfs/distro-specs/ubuntu/functions-8.04
+++ b/initramfs/distro-specs/ubuntu/functions-8.04
@@ -33,134 +33,3 @@ config_distro () {
   sed -i "s/start on runlevel 2/start on stopped rc2/" /mnt/etc/event.d/tty1
 }
 
-# configure gdm as display manager
-config_gdm () {
-ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc2.d/K20gdm
-if [ "x$start_xdmcp" = "xgdm" ]; then 
-  #  configure fallback if no gdm binary present
-  if ! binfinder gdm; then
-    config_kdm
-    # error "" nonfatal
-  else
-    echo $(binfinder gdm) > /mnt/etc/X11/default-display-manager
-  fi
-fi
-ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc2.d/S01gdm
-# append gdm user; check for presence first
-if ! grep "gdm:" /mnt/etc/passwd >/dev/null 2>&1; then
-  echo "gdm:x:113:" >>/mnt/etc/group
-  echo "gdm:x:106:113:Gnome Display Manager:/var/lib/gdm:/bin/false" \
-    >>/mnt/etc/passwd
-fi
-testmkd /mnt/var/lib/gdm/.fontconfig
-echo -e "\tchown gdm:gdm /var/lib/gdm/.fontconfig\n\tchown root:gdm \
-/var/lib/gdm\n" >>/mnt/etc/${D_INITDIR}/boot.slx
-# fixme: check if a gdm.conf was provided via ConfTGZ
-# [ -f /rootfs/etc/gdm/gdm.conf ??? ] || \
-echo -e "# /etc/gdm/gdm.conf - file generated by $0\n\
-
-[daemon]
-AutomaticLoginEnable=false
-AutomaticLogin=
-TimedLoginEnable=false
-TimedLogin=
-TimedLoginDelay=30
-Greeter=/usr/lib/gdm/gdmgreeter
-DefaultPath=/usr/local/bin:/usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/games
-RootPath=/usr/local/bin:/usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/games
-User=gdm
-Group=gdm
-LogDir=/var/log/gdm
-PidFile=/var/run/gdm.pid
-PostLoginScriptDir=/etc/gdm/PostLogin/
-PreSessionScriptDir=/etc/gdm/PreSession/
-PostSessionScriptDir=/etc/gdm/PostSession/
-DisplayInitDir=/etc/gdm/Init
-XKeepsCrashing=/etc/gdm/XKeepsCrashing
-RebootCommand=/sbin/shutdown -r now \"Rebooted from gdm menu.\"
-HaltCommand=/sbin/shutdown -h now \"Halted from gdm menu.\"
-SuspendCommand=/usr/sbin/pmi action sleep
-HibernateCommand=/usr/sbin/pmi action hibernate
-ServAuthDir=/var/lib/gdm
-BaseXsession=/etc/gdm/Xsession
-SessionDesktopDir=/etc/X11/sessions/:/etc/dm/Sessions/:/usr/share/gdm/BuiltInSessions/:/usr/share/xsessions/
-DefaultSession=default.desktop
-UserAuthDir=
-UserAuthFBDir=/tmp
-UserAuthFile=.Xauthority
-StandardXServer=${D_XORGBIN}
-Xnest=/usr/X11R6/bin/Xnest -br -audit 0 -name Xnest
-FirstVT=7
-VTAllocation=true
-SoundProgram=/usr/lib/gdmplay
-[security]
-AllowRoot=false
-AllowRemoteRoot=false
-AllowRemoteAutoLogin=false
-RelaxPermissions=0
-CheckDirOwner=true
-DisallowTCP=true
-[xdmcp]
-Enable=false
-[gui]
-GtkTheme=Human
-AllowGtkThemeChange=true
-GtkThemesToAllow=Human,HighContrast,HighContrastInverse,LowContrast
-[greeter]
-ConfigAvailable=false
-Browser=true
-MinimalUID=1000
-Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
-IncludeAll=true
-LocaleFile=/etc/gdm/locale.conf
-SystemMenu=true
-SecureSystemMenu=false
-DefaultWelcome=true
-DefaultRemoteWelcome=true
-BackgroundColor=#523921
-UseCirclesInEntry=true
-GraphicalTheme=Human
-GraphicalThemeDir=/usr/share/gdm/themes/
-GraphicalThemeRand=false
-SoundOnLogin=true
-SoundOnLoginFile=/usr/share/sounds/question.wav
-[chooser]
-HostImageDir=/usr/share/hosts/
-Hosts=
-Broadcast=true
-Multicast=false
-[debug]
-Enable=false
-[servers]
-0=Standard
-[server-Standard]
-name=Standard server
-command=/usr/X11R6/bin/X -br -audit 0 
-flexible=true
-[server-Terminal]
-name=Terminal server
-command=/usr/X11R6/bin/X -br -audit 0 -terminate
-flexible=false
-handled=false
-[server-Chooser]
-name=Chooser server
-command=/usr/X11R6/bin/X -br -audit 0
-flexible=false
-chooser=true
-
-[debug]
-Enable=$debug" >/mnt/etc/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/gdm/gdm.conf
-else
-  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/gdm/gdm.conf
-fi
-}
-
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 29cc3122..81eb5188 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -180,7 +180,6 @@ echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
   >>/mnt/etc/${D_INITDIR}/boot.slx
 }
 
-
 # acpi and powersave
 config_acpi () {
   rllinker "acpid" 10 19
@@ -193,157 +192,6 @@ config_acpi () {
   rllinker "udev" 11 25
 }
 
-# deprecated, moved to "desktop" plugin! Some of the preparations should
-# be moved to the ubuntu "desktop.sh" script to be defined in ubuntu.pm
-# configure gdm as display manager
-config_gdm () {
-ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/K20gdm
-if [ "x$start_xdmcp" = "xgdm" ]; then 
-  # existance is handled in Stage1 already!!
-  #  configure fallback if no gdm binary present
-  if ! binfinder gdm; then
-    config_kdm
-    # error "" nonfatal
-  else
-    echo $(binfinder gdm) > /mnt/etc/X11/default-display-manager
-  fi
-fi
-ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/S01gdm
-# append gdm user; check for presence first
-if ! grep "gdm:" /mnt/etc/passwd >/dev/null 2>&1; then
-  echo "gdm:x:113:" >>/mnt/etc/group
-  echo "gdm:x:106:113:Gnome Display Manager:/var/lib/gdm:/bin/false" \
-    >>/mnt/etc/passwd
-fi
-testmkd /mnt/var/lib/gdm/.fontconfig
-echo -e "\tchown gdm:gdm /var/lib/gdm/.fontconfig\n\tchown root:gdm \
-/var/lib/gdm\n" >>/mnt/etc/${D_INITDIR}/boot.slx
-# fixme: check if a gdm.conf was provided via ConfTGZ
-# [ -f /rootfs/etc/gdm/gdm.conf ??? ] || \
-echo -e "# /etc/gdm/gdm.conf - file generated by $0\n\
-
-[daemon]
-AutomaticLoginEnable=false
-AutomaticLogin=
-TimedLoginEnable=false
-TimedLogin=
-TimedLoginDelay=30
-Greeter=/usr/lib/gdm/gdmgreeter
-DefaultPath=/usr/local/bin:/usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/games
-RootPath=/usr/local/bin:/usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/games
-User=gdm
-Group=gdm
-LogDir=/var/log/gdm
-PidFile=/var/run/gdm.pid
-PostLoginScriptDir=/etc/gdm/PostLogin/
-PreSessionScriptDir=/etc/gdm/PreSession/
-PostSessionScriptDir=/etc/gdm/PostSession/
-DisplayInitDir=/etc/gdm/Init
-XKeepsCrashing=/etc/gdm/XKeepsCrashing
-RebootCommand=/sbin/shutdown -r now \"Rebooted from gdm menu.\"
-HaltCommand=/sbin/shutdown -h now \"Halted from gdm menu.\"
-SuspendCommand=/usr/sbin/pmi action sleep
-HibernateCommand=/usr/sbin/pmi action hibernate
-ServAuthDir=/var/lib/gdm
-BaseXsession=/etc/gdm/Xsession
-SessionDesktopDir=/etc/X11/sessions/:/etc/dm/Sessions/:/usr/share/gdm/BuiltInSessions/:/usr/share/xsessions/
-DefaultSession=default.desktop
-UserAuthDir=
-UserAuthFBDir=/tmp
-UserAuthFile=.Xauthority
-StandardXServer=${D_XORGBIN}
-Xnest=/usr/X11R6/bin/Xnest -br -audit 0 -name Xnest
-FirstVT=7
-VTAllocation=true
-SoundProgram=/usr/lib/gdmplay
-[security]
-AllowRoot=false
-AllowRemoteRoot=false
-AllowRemoteAutoLogin=false
-RelaxPermissions=0
-CheckDirOwner=true
-DisallowTCP=true
-[xdmcp]
-Enable=false
-[gui]
-GtkTheme=Human
-AllowGtkThemeChange=true
-GtkThemesToAllow=Human,HighContrast,HighContrastInverse,LowContrast
-[greeter]
-ConfigAvailable=false
-Browser=true
-MinimalUID=1000
-Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
-IncludeAll=true
-LocaleFile=/etc/gdm/locale.conf
-SystemMenu=true
-SecureSystemMenu=false
-DefaultWelcome=true
-DefaultRemoteWelcome=true
-BackgroundColor=#523921
-UseCirclesInEntry=true
-GraphicalTheme=Human
-GraphicalThemeDir=/usr/share/gdm/themes/
-GraphicalThemeRand=false
-SoundOnLogin=true
-SoundOnLoginFile=/usr/share/sounds/question.wav
-[chooser]
-HostImageDir=/usr/share/hosts/
-Hosts=
-Broadcast=true
-Multicast=false
-[debug]
-Enable=false
-[servers]
-0=Standard
-[server-Standard]
-name=Standard server
-command=/usr/X11R6/bin/X -br -audit 0 
-flexible=true
-[server-Terminal]
-name=Terminal server
-command=/usr/X11R6/bin/X -br -audit 0 -terminate
-flexible=false
-handled=false
-[server-Chooser]
-name=Chooser server
-command=/usr/X11R6/bin/X -br -audit 0
-flexible=false
-chooser=true
-
-[debug]
-Enable=$debug" >/mnt/etc/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/gdm/gdm.conf
-else
-  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/gdm/gdm.conf
-fi
-}
-
-# configure kdm as display manager
-config_kdm () {
-rllinker "kdm" 25 1
-if [ "x$start_xdmcp" = "xkdm" ]; then 
-  # configure fallback if no kdm binary is present
-  if ! binfinder kdm; then
-    config_gdm
-    # error "kdm configured but bin not found" nonfatal
-  else
-    echo $(binfinder kdm) >/mnt/etc/X11/default-display-manager
-  fi
-fi
-# write configuration file
-# use general config in /etc/functions
-config_kdm_template
-}
-
 # configure hal, dbus, resmgr and services like that
 config_dreshal () {
 if [ "x$start_dreshal" = "xyes" ]; then
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 928065a3..48b65a0a 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -322,151 +322,6 @@ if [ -n "$scratch" -a -z "$tmpisdisk" ] ; then
   esac
 fi
 
-#############################################################################
-# X11/GUI stuff
-if [ "x$start_x" != "xno" ] ; then
-  # creating directories commonly needed for X11 in all distros
-  # rest should be done via config_x11 function (distro specific)
-  for i in /var/lib/xkb/compiled \
-           /etc/X11/xdm \
-           /etc/X11/sessions \
-           /var/X11R6/bin \
-           /var/run/xdmctl \
-           /tmp/.ICE-unix \
-           /tmp/.X11-unix ; do testmkd /mnt/$i; done
-  chmod 1777 /mnt/tmp/.ICE-unix /mnt/tmp/.X11-unix
-  chown 0:0 /mnt/tmp/.ICE-unix /mnt/tmp/.X11-unix
-  echo "# file emtied by $0 during initramfs" > /mnt/etc/X11/xdm/Xservers
-  # define additional sessions offered to the user (via dhcp/ldap config)
-  # descsession -> deprecated by new vmware integration concept
-  # write available X display manager to /etc/X11/xdm/Xaccess
-  [ -n "$x_display_manager" ] && \
-  echo -e "# /etc/X11/xdm/Xaccess - file generated by $0: \
-$date\n*\n%hostlist\t$x_display_manager\n*\t\tCHOOSER %hostlist"\
-    >/mnt/etc/X11/xdm/Xaccess
-
-  # define type of X session
-  dsx="no"
-  case "$start_x" in
-    yes|YES|direct|DIRECT|query|QUERY)
-      # direct connection onto the own displaymanager, which
-      # should be enabled then
-#      [ "x$start_xdmcp" = "xno" ] && $start_xdmcp="yes"
-      init=""
-      dsx="yes"
-      xdmcp="false"
-      echo -e "# /etc/X11/Xservers - file generated by \
-$0: $date\n:0 local X :0 vt07\n" >/mnt/etc/X11/xdm/Xservers
-    ;;
-    broadcast|BROADCAST)
-      # the client will XDMCP broadcast and choose first available
-      # X11 server
-      [ "x$start_xdmcp" = "xgdm" ] || \
-        init="7:5:respawn:${D_XORGBIN} vt7 -quiet -broadcast"
-    ;;
-    indirect|INDIRECT)
-      # the client will try to XDMCP connect list of X11 servers
-      if [ "x$start_xdmcp" = "xgdm" ] ; then
-        init=""
-      else
-        init="7:5:respawn:${D_XORGBIN} vt7 -quiet -indirect $host_name"
-      fi
-      [ "x$start_xdmcp" = "xno" ] && start_xdmcp="yes"
-      xdmcp="true"
-    ;;
-    *)
-      # no display manager needed in kiosk mode
-      # in this mode you have to provide the type of X session to start
-      [ x$start_xdmcp != "x" ] || start_xdmcp="no";
-      init="7:5:respawn:/var/X11R6/bin/kiosk /dev/tty7"
-      # nobody can halt pc 
-      echo 'nobody ALL=NOPASSWD:/sbin/halt, /sbin/shutdown' >>/mnt/etc/sudoers
-      echo -e "#!/bin/sh\n# /var/X11R6/bin/kiosk - file generated by $0: $date
-      while ps aux|grep -i kiosk|grep -v \"grep\" &>/dev/null; do
-        test -f /var/run/kiosk || break; sleep 3;
-      done
-      touch /var/run/kiosk
-      for((i=0;\$i<=120;i=\$((\$i+1)))); do
-        [ -e /var/run/resmgr.pid ] && break
-        [ \$i = 120 ] && exit 1
-        sleep 1
-      done
-      resmgr login nobody tty8 \\
-      && resmgr grant nobody desktop \\
-      && chown -R nobody:nogroup /var/lib/nobody \\
-      && (su -c '(sleep 10; amixer -q sset Master 28 unmute; \\
-        amixer -q sset PCM 28 unmute) &
-        xinit /var/X11R6/bin/startgui $start_x \\
-        -- vt7 -quiet' -l nobody &>/dev/null)
-      rm /var/run/kiosk
-      resmgr revoke nobody
-      resmgr logout tty7
-      killall X" >/mnt/var/X11R6/bin/kiosk
-      # early start of kiosk session
-      echo -e "\t# kiosk start added by $0\n\t\
-/var/X11R6/bin/kiosk &>/dev/null &" >>/mnt/etc/${D_INITDIR}/boot.slx
-      cp /etc/startgui /mnt/var/X11R6/bin
-      chmod a+x /mnt/var/X11R6/bin/kiosk /mnt/var/X11R6/bin/startgui
-      rm /mnt/var/run/kiosk 2>/dev/null
-    ;;
-  esac
-  echo -e "# entry made by $0 $date\n$init" >> /mnt/etc/inittab
-  # most probably not needed any longer
-  if [ -n ${D_XORGBIN} ] ; then
-    testmkd /mnt/var/X11R6/bin
-    ln -sf ${D_XORGBIN} /mnt/var/X11R6/bin/X
-  fi
-fi
-
-# setup requested display manager
-if [ "x$start_xdmcp" != "xno" ] ; then
-  testmkd /mnt/var/lib/xdm/authdir/authfiles
-  testmkd /mnt/var/run/xdmctl
-  if [ "$start_xdmcp" = "yes" ] ; then
-    start_xdmcp=kdm
-  fi
-  # just ensure lowercase
-  start_xdmcp=$(echo $start_xdmcp|sed -e "y/'GKWXDM'/'gkwxdm'/")
-  case "$start_xdmcp" in
-    wdm)
-      # anywhere in use!?
-    ;;
-    kdm)
-      # config is most probably not common in all distros?
-      # distro specific function config_kdm
-      config_kdm
-    ;;
-    gdm)
-      # config is most probably not common in all distros?
-      # distro specific function config_gdm
-      config_gdm
-    ;;
-    *)
-      # setup xdm (should be the same over the several distros)
-      echo -e "# /etc/X11/xdm/xdm-config - file generated by\n\
-#\t$0: $date\n\nDisplayManager.errorLogFile:\t/var/log/xdm.errors\n\
-DisplayManager.pidFile:\t\t/var/run/xdm.pid\n\
-DisplayManager.authDir:\t\t/var/lib/xdm\n\
-DisplayManager.keyFile:\t\t/etc/X11/xdm/xdm-keys\n\
-DisplayManager.servers:\t\t/etc/X11/xdm/Xservers\n\
-DisplayManager.accessFile:\t/etc/X11/xdm/Xaccess\n\
-DisplayManager.willing:\t\tsu nobody -c /etc/X11/xdm/Xwilling\n\
-DisplayManager.*.authName:\tMIT-MAGIC-COOKIE-1\n\
-DisplayManager.*.authComplain:\tfalse\n\
-DisplayManager.*.setup:\t\t/etc/X11/xdm/Xsetup\n\
-DisplayManager.*.chooser:\t/etc/X11/xdm/RunChooser\n\
-DisplayManager.*.startup:\t/etc/X11/xdm/Xstartup\n\
-DisplayManager.*.session:\t/etc/X11/xdm/Xsession\n\
-DisplayManager.*.reset:\t\t/etc/X11/xdm/Xreset" \
-         >/mnt/etc/X11/xdm/xdm-config
-      [ "$xdmcp" = "false" ] && echo -e \
-      "DisplayManager.requestPort:\t0\n" >>/mnt/etc/X11/xdm/xdm-config
-      # distro specific function config_xdm (at least for runlevel links)
-      config_xdm
-    ;;
-  esac
-fi
-
 # script run timer
 [ $DEBUGLEVEL -eq 8 ] && echo "** SW setup finished at $(sysup)"
 
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 () {
 :
diff --git a/initramfs/initrd-stuff/etc/startgui b/initramfs/initrd-stuff/etc/startgui
deleted file mode 100755
index 37955a23..00000000
--- a/initramfs/initrd-stuff/etc/startgui
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-#
-# Description: startgui runs as script replacement for xinit
-#
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 19-05-2006
-#		Michael Janczyk, 28-09-2007
-# Copyright:    (c) 2003, 2007 - RZ Universitaet Freiburg
-#
-# Version:      0.1.0c
-#
-# /var/X11R6/bin/startgui
-# 
-###########################################################################
-
-WM=$1
-[ $WM ] || WM=kde
-case "$WM" in
-  *fvwm*)
-    fvwm2
-  ;;
-  *kde*)
-    startkde
-  ;;
-  *wmaker*|*windowmaker*)
-    wmaker
-  ;;
-  *ice*)
-    icewm
-  ;;
-  *gnome*)
-    gnome
-  ;;
-  *citrix|Citrix|ICAClient|*wfica)
-    wfica
-  ;;
-  *citrix-mgr|*citrix-indirect|*wfcmgr)
-    #
-  ;;
-  *vmware*)
-    /var/X11R6/bin/xdialog.sh
-  ;;
-  *)
-    if which $WM; then
-      $WM
-      error "Session ended ... Click OK to restart X" xmessage
-    else
-      error "Tried: $WM - Kein sinnvoller wm angegeb." xmessage
-      xterm
-    fi
-  ;;
-esac
-exit 0