general kdm config now in /etc/functions

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

4 files changed, 33 insertions, 105 deletions

diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default
index b6d4329a..b1b4022f 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -236,8 +236,18 @@ config_gdm () {
 
 # configure kdm as display manager
 config_kdm () {
-  ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm
-  ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/S20kdm
+# first define directories for kdm
+kdmrcdir=/etc/kde3/kdm
+xdmdir=/etc/kde3/kdm
+
+testmkd /mnt/${kdmrcdir}
+
+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
diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default
index d3412ca3..3f6eafd8 100644
--- a/initramfs/distro-specs/gentoo/functions-default
+++ b/initramfs/distro-specs/gentoo/functions-default
@@ -187,7 +187,17 @@ config_rc_entry "DISPLAYMANAGER" "gdm"
 
 # configure kdm as display manager
 config_kdm () {
+# first define directories for kdm
+#kdmrcdir=/etc/opt/kde3/share/config/kdm
+#xdmdir=/etc/X11/xdm
+
+#testmkd /mnt/${kdmrcdir}
+
 config_rc_entry "DISPLAYMANAGER" "kdm"
+
+# write configuration file
+# use general config in /etc/functions
+#config_kdm_template
 }
 
 # configure bluetooth services
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 33de9b6c..3f52af48 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -294,109 +294,17 @@ fi
 
 # configure kdm as display manager
 config_kdm () {
-config_dm_entry yes
-usetheme=false
-themeconf=$(ls /mnt/var/lib/openslx/themes/displaymanager/*.xml 2>/dev/null)
-testmkd /mnt/etc/opt/kde3/share/config/kdm
-[ -r "${themeconf}" ] && usetheme=true
-# check if a kdmrc was provided via ConfTGZ
-[ -f /rootfs/etc/opt/kde3/share/config/kdm/kdmrc ] || \
-  echo -e "# /etc/opt/kde3/share/config/kdm/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=/etc/X11/xdm/Xaccess
-Willing=/etc/X11/xdm/Xwilling
-
-[Shutdown]HaltCmd=/sbin/halt
-RebootCmd=/sbin/reboot
+# first define directories for kdm
+kdmrcdir=/etc/opt/kde3/share/config/kdm
+xdmdir=/etc/X11/xdm
 
+testmkd /mnt/${kdmrcdir}
 
-[X-*-Core]
-ServerCmd=/usr/X11R6/bin/X -br
-ServerArgsLocal=-nolisten tcp
-TerminateServer=true
-Resources=/etc/X11/xdm/Xresources
-Setup=/etc/X11/xdm/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=/etc/X11/xdm/Xstartup
-Reset=/etc/X11/xdm/Xreset
-Session=/etc/X11/xdm/Xsession
-ClientLogFile=.xsession-errors-%s
-AutoReLogin=false
-AllowRootLogin=true
-AllowNullPasswd=true
-AllowShutdown=All
-SessionsDirs=/etc/X11/sessions,/usr/share/xsessions,\
-/opt/kde3/share/apps/kdm/sessions
-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=${usetheme}
-Theme=/var/lib/openslx/themes/displaymanager
-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/etc/opt/kde3/share/config/kdm/kdmrc
+config_dm_entry yes
 
-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
+# write configuration file
+# use general config in /etc/functions
+config_kdm_template
 }
 
 # configure bluetooth services
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index b245f8fb..4badbcf7 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -338,9 +338,8 @@ config_kdm () {
 kdmrcdir=/etc/kde3/kdm
 xdmdir=/etc/kde3/kdm
 
-# fixme: check if a kdmrc was provided via ConfTGZ
-#[ -f /rootfs/etc/opt/???? kdmrc ] || \
-# echo " ..." > kdmrc
+testmkd /mnt/${kdmrcdir}
+
 #if [ "x$late_dm" = "xyes" ] ; then
  rllinker "kdm" "25" "01"
  if [ "x$start_xdmcp" = "xkdm" ]; then 
@@ -354,6 +353,7 @@ xdmdir=/etc/kde3/kdm
 #fi
 
 # write configuration file
+# use general config in /etc/functions
 config_kdm_template
 }