From 799b4c4e181b76e2387708e4f6e4855cac8ebbef Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Tue, 29 Jan 2008 18:39:55 +0000
Subject: moved creation of dir into main function

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1503 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/distro-specs/debian/functions-default | 1 -
 initramfs/distro-specs/gentoo/functions-default | 3 ---
 initramfs/distro-specs/suse/functions-10.2      | 2 --
 initramfs/distro-specs/suse/functions-10.3      | 2 --
 initramfs/distro-specs/suse/functions-default   | 2 --
 initramfs/distro-specs/ubuntu/functions-6.10    | 3 ---
 initramfs/distro-specs/ubuntu/functions-default | 2 --
 initramfs/initrd-stuff/etc/functions            | 2 ++
 8 files changed, 2 insertions(+), 15 deletions(-)

(limited to 'initramfs')

diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default
index 2d52f8ab..24f0fa2b 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -223,7 +223,6 @@ fi
 # configure kdm as display manager
 config_kdm () {
 # first define directories for kdm
-testmkd /mnt/${D_KDMRCPATH}
 ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm
 ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/S20kdm
 
diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default
index a4716511..3bb0103f 100644
--- a/initramfs/distro-specs/gentoo/functions-default
+++ b/initramfs/distro-specs/gentoo/functions-default
@@ -271,9 +271,6 @@ config_dm_entry gdm
 config_kdm () {
 config_dm_entry kdm
 
-# first define directories for kdm
-testmkd /mnt/${D_KDMRCPATH}
-
 # setting the path for kdmrc-file 
 # FIXME: hack - there is no other way in gentoo?!? Why the hell in "themes"
 # directory??
diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2
index 8af46196..2dd18c70 100644
--- a/initramfs/distro-specs/suse/functions-10.2
+++ b/initramfs/distro-specs/suse/functions-10.2
@@ -15,11 +15,9 @@
 
 # display manager configuration
 config_kdm () {
-# first define directories for kdm
 # use different kdmrc than default, since 10.2 in /opt/kde/...
 echo "XDMOPTIONS=\" -config ${D_KDMRCPATH}\"" \
   >> /mnt/etc/sysconfig/displaymanager
-testmkd /mnt/${D_KDMRCPATH}
 config_dm_entry yes
 # write configuration file with general config from /etc/functions
 config_kdm_template
diff --git a/initramfs/distro-specs/suse/functions-10.3 b/initramfs/distro-specs/suse/functions-10.3
index e9a0c5eb..8ec25c15 100644
--- a/initramfs/distro-specs/suse/functions-10.3
+++ b/initramfs/distro-specs/suse/functions-10.3
@@ -15,11 +15,9 @@
 
 # display manager configuration
 config_kdm () {
-# first define directories for kdm
 # use different kdmrc than default, since 10.2 in /opt/kde/...
 echo "XDMOPTIONS=\"-config ${D_KDMRCPATH}\"" \
   >> /mnt/etc/sysconfig/displaymanager
-testmkd /mnt/${D_KDMRCPATH}
 config_dm_entry yes
 # write configuration file with general config from /etc/functions
 config_kdm_template
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 6d70a19e..d3ed074b 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -368,8 +368,6 @@ fi
 }
 # configure kdm as display manager
 config_kdm () {
-# first define directories for kdm
-testmkd /mnt/${D_KDMRCPATH}
 config_dm_entry yes
 # write configuration file
 # use general config in /etc/functions
diff --git a/initramfs/distro-specs/ubuntu/functions-6.10 b/initramfs/distro-specs/ubuntu/functions-6.10
index cc856d1a..44d60211 100644
--- a/initramfs/distro-specs/ubuntu/functions-6.10
+++ b/initramfs/distro-specs/ubuntu/functions-6.10
@@ -102,9 +102,6 @@ rllinker "console-screen.sh" 31 3
 
 # configure kdm as display manager
 config_kdm () {
-# first define directories for kdm
-testmkd /mnt/${D_KDMRCPATH}
-
 rllinker "kdm" 3 1
 if [ "x$start_xdmcp" = "xkdm" ]; then 
   echo /usr/bin/kdm > /mnt/etc/X11/default-display-manager
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 4c483869..0bd396cb 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -322,8 +322,6 @@ fi
 
 # configure kdm as display manager
 config_kdm () {
-# first define directories for kdm
-testmkd /mnt/${D_KDMRCPATH}
 rllinker "kdm" 25 1
 if [ "x$start_xdmcp" = "xkdm" ]; then 
   # configure fallback if no kdm binary is present
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 1ea52e0d..218bd6d3 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -922,6 +922,8 @@ include_in_fsroot_union () {
 
 # kdmrc template started from distro specific functions files
 config_kdm_template () {
+testmkd /mnt/${D_KDMRCPATH}
+testmkd /mnt/var/lib/openslx/themes/displaymanager
 # check if a kdmrc was provided via ConfTGZ
 [ -f /rootfs/${D_KDMRCPATH}/kdmrc ] || \
   echo -e "# ${D_KDMRCPATH}/kdmrc - \
-- 
cgit v1.2.3-55-g7522