summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorOliver Tappe2007-05-03 14:56:14 +0200
committerOliver Tappe2007-05-03 14:56:14 +0200
commitd65216ef5202c7d99040dc7f39d0b31d57939037 (patch)
treedde63b4fadb08ac836607dc344eeddcca5787343 /installer
parent* now always passed '-d' to mkdxsinitrd in order to avoid using the busybox-p... (diff)
downloadcore-d65216ef5202c7d99040dc7f39d0b31d57939037.tar.gz
core-d65216ef5202c7d99040dc7f39d0b31d57939037.tar.xz
core-d65216ef5202c7d99040dc7f39d0b31d57939037.zip
* removed reference to start_rwhod as it shouldn't be used anymore, anyway.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@991 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rw-r--r--installer/default_files/machine-setup.default21
1 files changed, 9 insertions, 12 deletions
diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default
index 80bec1c5..713c1c64 100644
--- a/installer/default_files/machine-setup.default
+++ b/installer/default_files/machine-setup.default
@@ -6,11 +6,11 @@
#### options, see dhcpd.conf example) - some settings could be done only
#### within this file (no DHCP variable definition available)
#
-# universal (distro independent) configuration file for slx linux diskless
-# client. It defines default values for several configuration variables.
+# universal (distro independent) configuration file for slx linux diskless
+# client. It defines default values for several configuration variables.
# These settings might be overwritten through various processes in initial
-# ramfs in stage3. New settings are simply appended, so that they might
-# overwrite previously defined variables
+# ramfs in stage3. New settings are simply appended, so that they might
+# overwrite previously defined variables
#
# Dirk von Suchodoletz <dvs@OpenSLX.com>, 2006
#
@@ -32,7 +32,7 @@ root_pw=@@@root_pw@@@
host_name="dxs"
domain_name="slx.test"
-# define country for all localization stuff - see functions how country
+# define country for all localization stuff - see functions how country
# is translated to LANGUAGE, COUNTRY, LANG, KEYTABLE, XKEYBOARD,
# KDEKEYBOARD, CHARSET, KDEKEYBOARDS, TZ and CONSOLEFONT
country="de"
@@ -44,7 +44,7 @@ tex_enable="no"
## services to start (yes) or configure (may) or disable (no)
#
-# network time protocol daemon ("yes" for normal daemon operation,
+# network time protocol daemon ("yes" for normal daemon operation,
# "initial" just for setting during startup with ntpdate)
start_ntp="initial"
# set timezone if not to be derived from language setting
@@ -53,9 +53,6 @@ start_ntp="initial"
# start sshd (hostkeys should be pregenerated by install script)
start_sshd="yes"
-# start rwhod service (lan wide login and uptime list)
-start_rwhod="no"
-
# start log server (remote log servers could be either passed via dhcp option
# or by giving the server URI instead of yes. udp and tcp are possible)
# start_syslog="syslog://@@@serverip@@@:port/udp"
@@ -91,7 +88,7 @@ netbios_workgroup="dxs-network"
# nfs v4
#start_nfsv4="no"
-# automounter home (/local_dir - top level directories only) and source
+# automounter home (/local_dir - top level directories only) and source
# (format (proto://)server/path)
# if openslx server and server for the home is the same machine, you can
# use @@@serverip@@@ instead of a fixed setting here
@@ -100,7 +97,7 @@ netbios_workgroup="dxs-network"
# scratch space on server "proto://serverip/slx/tmp"
-# if openslx server and server for the remote rw scratch is the same
+# if openslx server and server for the remote rw scratch is the same
# machine, you can use @@@serverip@@@ instead of a fixed setting here
#scratch="(proto://)serverip/dxs/tmp"
@@ -109,7 +106,7 @@ vmware="no"
#vmware="(proto://)serverip/dxs/vmware"
# imgsrv is deprecated, because incorporated into vmware variable
-# kind of X11 display manager to run
+# kind of X11 display manager to run
start_xdmcp="kdm"
# for kdm/gdm - enable shutdown option on login screen "user/root/none"
dm_allow_shutdown="user"