diff options
Diffstat (limited to 'initrd/initrd-stuff/bin/servconfig')
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 952c7521..a984805e 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -178,7 +178,7 @@ if [ "x$start_x" != "xno" ] ; then [ -n "$x_display_manager" ] && \ echo -e "# /etc/X11/xdm/Xaccess - file generated by $0: \ $date\n*\n%hostlist\t$x_display_manager\n*\t\tCHOOSER %hostlist"\ - >/etc/X11/xdm/Xaccess + >/mnt/etc/X11/xdm/Xaccess # define type of X session dsx="no" @@ -238,12 +238,15 @@ if [ "x$start_xdmcp" != "xno" ] ; then start_xdmcp=kdm fi case "$start_xdmcp" in - wdm|WDM) + wdm) # anywhere in use!? ;; - esac - # setup xdm (as fallback) in any case - echo -e "# /etc/X11/xdm/xdm-config - file generated by\n\ + gdm) + config_gdm + ;; + *) + # setup xdm + echo -e "# /etc/X11/xdm/xdm-config - file generated by\n\ #\t$0: $date\n\nDisplayManager.errorLogFile:\t/var/log/xdm.errors\n\ DisplayManager.pidFile:\t\t/var/run/xdm.pid\n\ DisplayManager.authDir:\t\t/var/lib/xdm\n\ @@ -258,7 +261,9 @@ DisplayManager.*.chooser:\t/etc/X11/xdm/RunChooser\n\ DisplayManager.*.startup:\t/etc/X11/xdm/Xstartup\n\ DisplayManager.*.session:\t/etc/X11/xdm/Xsession\n\ DisplayManager.*.reset:\t\t/etc/X11/xdm/Xreset" >/mnt/etc/X11/xdm/xdm-config - [ "$xdmcp" = "false" ] && echo -e \ - "DisplayManager.requestPort:\t0\n" >>/mnt/etc/X11/xdm/xdm-config - config_dm + [ "$xdmcp" = "false" ] && echo -e \ + "DisplayManager.requestPort:\t0\n" >>/mnt/etc/X11/xdm/xdm-config + config_xdm + ;; + esac fi |