added Gentoo-specific services (needs autofs-support in kernel) + kdmrc-file

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

2 files changed, 98 insertions, 4 deletions

diff --git a/initramfs/distro-specs/gentoo/config-default b/initramfs/distro-specs/gentoo/config-default
index 2275c685..5ff1becf 100644
--- a/initramfs/distro-specs/gentoo/config-default
+++ b/initramfs/distro-specs/gentoo/config-default
@@ -42,7 +42,7 @@ D_INITDIR="/init.d"
 D_INITBOOTD="/runlevels/boot"
 D_INITDEFAULT="3"
 D_RCDIRS="/runlevels/default /runlevels/single /runlevels/nonetwork"
-D_INITSCRIPTS="localmount keymaps clock urandom"
+D_INITSCRIPTS="localmount keymaps clock urandom resmgrd splash autofs dbus ivman local"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
 D_XORGBIN=/usr/bin/Xorg
 D_XFONTPATH="/usr/share/fonts/*"
diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default
index 9fb025fd..ab4bfb2e 100644
--- a/initramfs/distro-specs/gentoo/functions-default
+++ b/initramfs/distro-specs/gentoo/functions-default
@@ -293,12 +293,106 @@ config_kdm () {
 config_dm_entry kdm
 
 # first define directories for kdm
-kdmrcdir=/etc/opt/kde3/share/config/kdm
+kdmrcdir=/var/lib/openslx/themes/displaymanager/
 xdmdir=/etc/X11/xdm
 testmkd /mnt/${kdmrcdir}
 
-# write configuration file while using general config in /etc/functions
-config_kdm_template
+
+# write configuration file - NOT using general config in /etc/functions
+##config_kdm_template
+
+usetheme=false
+themeconf=$(ls /mnt/var/lib/openslx/themes/displaymanager/*.xml 2>/dev/null)
+[ -r "${themeconf}" ] && usetheme=true
+# check if a kdmrc was provided via ConfTGZ
+[ -f /rootfs/${kdmrcdir}/kdmrc ] || \
+  echo -e "# ${kdmrcdir}/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=false
+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/${kdmrcdir}/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 /var/lib/openslx/themes/displaymanager/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/var/lib/openslx/themes/displaymanager/kdmrc
+
 }
 
 # configure bluetooth services