diff options
Diffstat (limited to 'initrd/distro-specs/suse/functions-default')
| -rw-r--r-- | initrd/distro-specs/suse/functions-default | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/initrd/distro-specs/suse/functions-default b/initrd/distro-specs/suse/functions-default index 34cf34c9..a2d5ba48 100644 --- a/initrd/distro-specs/suse/functions-default +++ b/initrd/distro-specs/suse/functions-default @@ -179,7 +179,9 @@ if [ "${DEBUGLEVEL}" -gt 0 ] ; then else local debug="false" fi -echo -e "# /etc/opt/gnome/gdm/gdm.conf - file generated by $0\n\ +# check if a gdm.conf was provided via ConfTGZ +if [ ! -f /etc/opt/gnome/gdm/gdm.conf ] ; then + echo -e "# /etc/opt/gnome/gdm/gdm.conf - file generated by $0\n\ [daemon] AutomaticLoginEnable=false TimedLoginEnable=false @@ -269,24 +271,27 @@ Hosts=$xdmcp_hosts [debug] Enable=$debug" >/mnt/etc/opt/gnome/gdm/gdm.conf -if [ "x$start_x" = "xindirect" ] ; then - # when X server consumes to much mem set X -terminate - echo -e "\n[servers]\n0=Terminal -audit 0 -indirect \ + if [ "x$start_x" = "xindirect" ] ; then + # when X server consumes to much mem set X -terminate + echo -e "\n[servers]\n0=Terminal -audit 0 -indirect \ $host_name\n\n\ [server-Terminal]\nname=Terminal server\ncommand=/usr/X11R6/bin/X \ -audit 0\n\ flexible=true\nhandled=true\nchooser=true" >>/mnt/etc/opt/gnome/gdm/gdm.conf -else - echo -e "\n[servers]\n0=Standard\n\n\ + else + echo -e "\n[servers]\n0=Standard\n\n\ [server-Standard]\nname=Standard server\ncommand=/usr/X11R6/bin/X\n\ flexible=true\nhandled=true" >>/mnt/etc/opt/gnome/gdm/gdm.conf + fi fi } # configure kdm as display manager config_kdm () { config_dm_entry yes -echo -e "# /etc/opt/kde3/share/config/kdm/kdmrc - \ +# check if a kdmrc was provided via ConfTGZ +[ -f /rootfs/etc/opt/kde3/share/config/kdm/kdmrc ] || \ + echo -e "# /etc/opt/kde3/share/config/kdm/kdmrc - \ file generated by\n\ #\t$0: $date\n\ [General]\n\ |