Moving setup of client mode (variable desktop::kind) and displaymanager

(variable desktop::manager) into the desktop plugin ... the old
variables start_x and start_xdmcp are deprecated in the near future ...


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

7 files changed, 18 insertions, 0 deletions

diff --git a/initramfs/distro-specs/debian/config-default b/initramfs/distro-specs/debian/config-default
index 7e426a2a..8e3f5cd5 100644
--- a/initramfs/distro-specs/debian/config-default
+++ b/initramfs/distro-specs/debian/config-default
@@ -55,5 +55,7 @@ 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 e26faa0f..67e613c2 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -173,6 +173,8 @@ 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
@@ -189,6 +191,7 @@ fi
 #/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
diff --git a/initramfs/distro-specs/gentoo/config-default b/initramfs/distro-specs/gentoo/config-default
index a9687494..13927a6f 100644
--- a/initramfs/distro-specs/gentoo/config-default
+++ b/initramfs/distro-specs/gentoo/config-default
@@ -49,5 +49,8 @@ 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/suse/config-default b/initramfs/distro-specs/suse/config-default
index 0e589adf..9187df65 100644
--- a/initramfs/distro-specs/suse/config-default
+++ b/initramfs/distro-specs/suse/config-default
@@ -61,5 +61,7 @@ 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/ubuntu/config-default b/initramfs/distro-specs/ubuntu/config-default
index 59ada655..4f74f23c 100644
--- a/initramfs/distro-specs/ubuntu/config-default
+++ b/initramfs/distro-specs/ubuntu/config-default
@@ -63,5 +63,8 @@ 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-default b/initramfs/distro-specs/ubuntu/functions-default
index ed973fa9..29cc3122 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -193,10 +193,13 @@ 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
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 138260be..d2eb79b7 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -922,6 +922,8 @@ 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}