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

2 files changed, 0 insertions, 43 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