From e24bb48700c4c4e36467374808dcb35c03f8d1d1 Mon Sep 17 00:00:00 2001 From: Michael Janczyk Date: Tue, 29 Jan 2008 18:11:40 +0000 Subject: switched kdmrc path to config-default variable, and removed from each kdm function, hope kdm theme works now everywhere, cleaning still to be done + gdm completely renewed git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1502 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initramfs/distro-specs/debian/config-default | 2 ++ initramfs/distro-specs/debian/functions-default | 4 +--- initramfs/distro-specs/gentoo/config-default | 2 ++ initramfs/distro-specs/gentoo/functions-default | 18 ++++++++---------- initramfs/distro-specs/suse/functions-10.2 | 6 ++---- initramfs/distro-specs/suse/functions-10.3 | 6 ++---- initramfs/distro-specs/ubuntu/config-default | 2 ++ initramfs/distro-specs/ubuntu/functions-6.10 | 4 +--- initramfs/distro-specs/ubuntu/functions-default | 4 +--- initramfs/initrd-stuff/etc/functions | 6 +++--- 10 files changed, 24 insertions(+), 30 deletions(-) (limited to 'initramfs') diff --git a/initramfs/distro-specs/debian/config-default b/initramfs/distro-specs/debian/config-default index a2ffe2fd..84581990 100644 --- a/initramfs/distro-specs/debian/config-default +++ b/initramfs/distro-specs/debian/config-default @@ -55,3 +55,5 @@ D_XF86CONFFILE="/etc/X11/xorg.conf" D_XORGBIN=/usr/X11R6/bin/X D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*" D_DEFAULTCOUNTRY="de" +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 edd665e3..2d52f8ab 100644 --- a/initramfs/distro-specs/debian/functions-default +++ b/initramfs/distro-specs/debian/functions-default @@ -223,9 +223,7 @@ fi # configure kdm as display manager config_kdm () { # first define directories for kdm -local kdmrcdir=/etc/kde3/kdm -local xdmdir=/etc/kde3/kdm -testmkd /mnt/${kdmrcdir} +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/config-default b/initramfs/distro-specs/gentoo/config-default index bd93b216..6cd78eea 100644 --- a/initramfs/distro-specs/gentoo/config-default +++ b/initramfs/distro-specs/gentoo/config-default @@ -49,3 +49,5 @@ D_XFONTPATH="/usr/share/fonts/*" D_DEFAULTCOUNTRY="de" D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng" D_BOOTLOCAL="conf.d/local.start" +D_KDMRCPATH=/var/lib/openslx/themes/displaymanager +D_XDMPATH=/etc/X11/kdm diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default index 74d0e794..a4716511 100644 --- a/initramfs/distro-specs/gentoo/functions-default +++ b/initramfs/distro-specs/gentoo/functions-default @@ -272,25 +272,23 @@ config_kdm () { config_dm_entry kdm # first define directories for kdm -kdmrcdir=/var/lib/openslx/themes/displaymanager/ -xdmdir=/etc/X11/xdm -testmkd /mnt/${kdmrcdir} +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?? -sed -e 's,\(PIDFILE:.*\)|| \\$,\1 -- -config /var/lib/openslx/themes/displaymanager/kdmrc || \\,g'\ +sed -e 's,\(PIDFILE:.*\)|| \\$,\1 -- -config \${D_KDMRCPATH}/kdmrc || \\,g'\ -i /mnt/etc/X11/startDM.sh # 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) +themeconf=$(ls /mnt/${D_KDMRCPATH}/*.xml 2>/dev/null) [ -r "${themeconf}" ] && usetheme=true # check if a kdmrc was provided via ConfTGZ -[ -f /rootfs/${kdmrcdir}/kdmrc ] || \ - echo -e "# ${kdmrcdir}/kdmrc - \ +[ -f /rootfs/${D_KDMRCPATH}/kdmrc ] || \ + echo -e "# ${D_KDMRCPATH}/kdmrc - \ file generated by #\t$0: $date\n\ [General] @@ -344,7 +342,7 @@ 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 +GreetFont=Nimbus Sans l,20,-1,5,48,0,0,0,0,0" >/mnt/${D_KDMRCPATH}/kdmrc echo -e "[Desktop0] BackgroundMode=Flat BlendBalance=100 @@ -368,14 +366,14 @@ WallpaperMode=NoWallpaper" \ #Gentoo specifics?? -#sed -e 's,\(save_options .*\)"$,\1 -- -config /var/lib/openslx/themes/displaymanager/kdmrc",g'\ +#sed -e 's,\(save_options .*\)"$,\1 -- -config ${D_KDMRCPATH}/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 +# -i /mnt/${D_KDMRCPATH}/kdmrc } diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2 index c1c1a1ec..8af46196 100644 --- a/initramfs/distro-specs/suse/functions-10.2 +++ b/initramfs/distro-specs/suse/functions-10.2 @@ -16,12 +16,10 @@ # display manager configuration config_kdm () { # first define directories for kdm -kdmrcdir=/etc/opt/kde3/share/config/kdm -xdmdir=/etc/X11/xdm # use different kdmrc than default, since 10.2 in /opt/kde/... -echo 'XDMOPTIONS="-config /etc/opt/kde3/share/config/kdm/kdmrc"' \ +echo "XDMOPTIONS=\" -config ${D_KDMRCPATH}\"" \ >> /mnt/etc/sysconfig/displaymanager -testmkd /mnt/${kdmrcdir} +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 4afaff8d..e9a0c5eb 100644 --- a/initramfs/distro-specs/suse/functions-10.3 +++ b/initramfs/distro-specs/suse/functions-10.3 @@ -16,12 +16,10 @@ # display manager configuration config_kdm () { # first define directories for kdm -kdmrcdir=/etc/opt/kde3/share/config/kdm -xdmdir=/etc/X11/xdm # use different kdmrc than default, since 10.2 in /opt/kde/... -echo 'XDMOPTIONS="-config /etc/opt/kde3/share/config/kdm/kdmrc"' \ +echo "XDMOPTIONS=\"-config ${D_KDMRCPATH}\"" \ >> /mnt/etc/sysconfig/displaymanager -testmkd /mnt/${kdmrcdir} +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/ubuntu/config-default b/initramfs/distro-specs/ubuntu/config-default index 08980d46..071b344e 100644 --- a/initramfs/distro-specs/ubuntu/config-default +++ b/initramfs/distro-specs/ubuntu/config-default @@ -63,3 +63,5 @@ D_XORGBIN=/usr/X11R6/bin/X D_XFONTPATH="/usr/share/fonts/*" D_DEFAULTCOUNTRY="de" D_BOOTLOCAL="" +D_KDMRCPATH=/etc/kde3/kdm +D_XDMPATH=/etc/kde3/kdm diff --git a/initramfs/distro-specs/ubuntu/functions-6.10 b/initramfs/distro-specs/ubuntu/functions-6.10 index e84898da..cc856d1a 100644 --- a/initramfs/distro-specs/ubuntu/functions-6.10 +++ b/initramfs/distro-specs/ubuntu/functions-6.10 @@ -103,9 +103,7 @@ rllinker "console-screen.sh" 31 3 # configure kdm as display manager config_kdm () { # first define directories for kdm -local kdmrcdir=/etc/kde3/kdm -local xdmdir=/etc/kde3/kdm -testmkd /mnt/${kdmrcdir} +testmkd /mnt/${D_KDMRCPATH} rllinker "kdm" 3 1 if [ "x$start_xdmcp" = "xkdm" ]; then diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default index 8ffb722a..4c483869 100644 --- a/initramfs/distro-specs/ubuntu/functions-default +++ b/initramfs/distro-specs/ubuntu/functions-default @@ -323,9 +323,7 @@ fi # configure kdm as display manager config_kdm () { # first define directories for kdm -kdmrcdir=/etc/kde3/kdm -xdmdir=/etc/kde3/kdm -testmkd /mnt/${kdmrcdir} +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 7b6f127e..1ea52e0d 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -923,8 +923,8 @@ include_in_fsroot_union () { # kdmrc template started from distro specific functions files config_kdm_template () { # check if a kdmrc was provided via ConfTGZ -[ -f /rootfs/${kdmrcdir}/kdmrc ] || \ - echo -e "# ${kdmrcdir}/kdmrc - \ +[ -f /rootfs/${D_KDMRCPATH}/kdmrc ] || \ + echo -e "# ${D_KDMRCPATH}/kdmrc - \ file generated by #\t$0: $date\n\ [General] @@ -991,7 +991,7 @@ ClientLogFile=.xsession-errors NoPassEnable=false [X-:0-Greeter] LogSource=/dev/xconsole -UseAdminSession=false" >/mnt/${kdmrcdir}/kdmrc +UseAdminSession=false" >/mnt/${D_KDMRCPATH}/kdmrc echo -e "[Desktop0] BackgroundMode=Flat BlendBalance=100 -- cgit v1.2.3-55-g7522