diff options
Diffstat (limited to 'initramfs/distro-specs/gentoo/functions-default')
| -rw-r--r-- | initramfs/distro-specs/gentoo/functions-default | 18 |
1 files changed, 8 insertions, 10 deletions
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 } |