summaryrefslogtreecommitdiffstats
path: root/os-plugins
diff options
context:
space:
mode:
authorMichael Janczyk2008-03-11 22:45:04 +0100
committerMichael Janczyk2008-03-11 22:45:04 +0100
commit1741355f440a84fa52b646ef72a741465f3733d1 (patch)
tree34bf33dac5fc8e1aac152c8d3ec52c4e7ac2459a /os-plugins
parentsmall correction (diff)
downloadcore-1741355f440a84fa52b646ef72a741465f3733d1.tar.gz
core-1741355f440a84fa52b646ef72a741465f3733d1.tar.xz
core-1741355f440a84fa52b646ef72a741465f3733d1.zip
adder kdmrc for testing
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1623 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rw-r--r--os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm6
-rw-r--r--os-plugins/plugins/displaymanager/files/kdmrc65
2 files changed, 68 insertions, 3 deletions
diff --git a/os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm b/os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm
index 2740a2b3..5660d91b 100644
--- a/os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm
+++ b/os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm
@@ -104,14 +104,14 @@ sub copyRequiredFilesIntoInitramfs
my $themeDir = "$openslxConfig{'base-path'}/share/themes";
my $displaymanagerXdmcp = $attrs->{'displaymanager::xdmcp'} || '';
- my $xdmcpConfigDir = "$openslxConfig{'base-path'}/lib/plugins/displaymanager/config/$displaymanagerXdmcp";
+ my $xdmcpConfigDir = "$openslxConfig{'base-path'}/lib/plugins/displaymanager/files/$displaymanagerXdmcp";
my $displaymanagerTheme = $attrs->{'displaymanager::theme'} || '';
if ($displaymanagerTheme) {
my $displaymanagerThemeDir
= "$themeDir/$displaymanagerTheme/displaymanager/$displaymanagerXdmcp";
if (-d $displaymanagerThemeDir) {
$makeInitRamFSEngine->addCMD(
- "mkdir -p $targetPath/usr/share/config"
+ "mkdir -p $targetPath/usr/share/files"
);
$makeInitRamFSEngine->addCMD(
"mkdir -p $targetPath/usr/share/themes"
@@ -120,7 +120,7 @@ sub copyRequiredFilesIntoInitramfs
"cp -a $displaymanagerThemeDir $targetPath/usr/share/themes/"
);
$makeInitRamFSEngine->addCMD(
- "cp -a $xdmcpConfigDir $targetPath/usr/share/config/"
+ "cp -a $xdmcpConfigDir $targetPath/usr/share/files"
);
}
}
diff --git a/os-plugins/plugins/displaymanager/files/kdmrc b/os-plugins/plugins/displaymanager/files/kdmrc
new file mode 100644
index 00000000..e835c103
--- /dev/null
+++ b/os-plugins/plugins/displaymanager/files/kdmrc
@@ -0,0 +1,65 @@
+[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