From d442db2b6964f7c1c6b042f6c229911f47f8fcaa Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Thu, 9 Mar 2006 22:02:40 +0000 Subject: comments, bugfix. git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@103 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initrd/initrd-stuff/etc/machine-setup | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'initrd/initrd-stuff/etc') diff --git a/initrd/initrd-stuff/etc/machine-setup b/initrd/initrd-stuff/etc/machine-setup index 0cdae408..1468997b 100644 --- a/initrd/initrd-stuff/etc/machine-setup +++ b/initrd/initrd-stuff/etc/machine-setup @@ -12,10 +12,10 @@ # # Copyright: (c) 2003 - 2006 - RZ Universitaet Freiburg # -# format variable="static_value" or variable="$serverip:123" -# it is possible to use the variables $serverip (the IP of the -# providing DHCP server - not neccessarily NFS server), $clientip -# (the IP of the client itself) and $host_name +## format variable="static_value" or variable="$serverip:123" ## +## it is possible to use the variables $serverip (the IP of the ## +## providing DHCP server - not neccessarily NFS server), $clientip ## +## (the IP of the client itself) and $host_name ## # # # password of system administrator (root) as crypt -> 'dxs-root' @@ -70,7 +70,7 @@ start_dreshal="yes" # start alsa sound system start_alsasound="yes" -# ssh +# start ssh server start_sshd="yes" # AFS network filesystem @@ -94,5 +94,9 @@ scratch="$serverip:/dxs/tmp" vmware="no" imgsrv="$serverip:/dxs/vmware" -start_xdmcp=xdm -start_x=yes +# kind of X11 display manager to run +start_xdmcp="xdm" + +# should Xorg/XFree server be started or some special windowmanager be run +# in kiosk mode e.g. start_x="kde" +start_x="yes" -- cgit v1.2.3-55-g7522