From ec96c6cd0a02cbb1420894350bd0efdba0e6a879 Mon Sep 17 00:00:00 2001 From: Nico Dietrich Date: Tue, 4 Apr 2006 19:31:22 +0000 Subject: fix for last commit git-svn-id: http://svn.openslx.org/svn/openslx/ld4@155 95ad53e4-c205-0410-b2fa-d234c58c8868 --- installer/default_files/machine-setup.default | 102 ++++++++++++++++++++++++++ installer/default_files/machine-setup_default | 102 -------------------------- installer/ld4-inst | 2 +- 3 files changed, 103 insertions(+), 103 deletions(-) create mode 100644 installer/default_files/machine-setup.default delete mode 100644 installer/default_files/machine-setup_default (limited to 'installer') diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default new file mode 100644 index 00000000..2f75c3ab --- /dev/null +++ b/installer/default_files/machine-setup.default @@ -0,0 +1,102 @@ +# machine-setup +# Description: universal (distro independent) configuration file for +# linux diskless clients v4.0. It defines default values +# for several configuration variables. These settings might +# be overwritten through various processes in initial ramdisk. +# New settings are simply appended, so that they might +# overwrite previously defined variables +# +# Author(s): Dirk von Suchodoletz , 09-03-2006 +# Blabla +# Blub +# +# 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 ## +# +# +# password of system administrator (root) as crypt -> 'dxs-root' +root_pw=@@@root_pw@@@ + +## name service configuration defaults +# +# host and domain name +host_name="dxs" +domain_name="test.ldc" + +# 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" + +## set some default variables +# +# enable setup of TeX environment +tex_enable="no" + +## services to start (yes) or configure (may) or disable (no) +# +# 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 +# timezone="Europe/Berlin" + +# 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 passed via dhcp option) +start_syslog="yes" + +# start cron service +start_cron="no" + +# start at daemon +start_atd="no" + +# simple network management protocol for system monitoring +start_snmp="no" + +# dbus, resource manager , hal (hardware abstraction layer) interoperate +# tighly. There might be little different solutions within each distro +start_dreshal="yes" + +# start alsa sound system +start_alsasound="yes" + +# start ssh server +start_sshd="yes" + +# AFS network filesystem +start_afs="no" +this_cell="uni-freiburg.de" +cell_server="132.230.6.237 132.230.6.236 132.230.6.235" + +# smb protocol service (provide windows file service) +start_samba="may" +netbios_workgroup="dxs-network" + +# automounter home (/local_dir - top level directories only) and source +# (server:/path) +automnt_dir="/home" +automnt_src="$serverip:/home" + +# scratch space on server +scratch="$serverip:/dxs/tmp" + +# configure and start vmware services +vmware="no" +imgsrv="$serverip:/dxs/vmware" + +# 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" diff --git a/installer/default_files/machine-setup_default b/installer/default_files/machine-setup_default deleted file mode 100644 index 2f75c3ab..00000000 --- a/installer/default_files/machine-setup_default +++ /dev/null @@ -1,102 +0,0 @@ -# machine-setup -# Description: universal (distro independent) configuration file for -# linux diskless clients v4.0. It defines default values -# for several configuration variables. These settings might -# be overwritten through various processes in initial ramdisk. -# New settings are simply appended, so that they might -# overwrite previously defined variables -# -# Author(s): Dirk von Suchodoletz , 09-03-2006 -# Blabla -# Blub -# -# 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 ## -# -# -# password of system administrator (root) as crypt -> 'dxs-root' -root_pw=@@@root_pw@@@ - -## name service configuration defaults -# -# host and domain name -host_name="dxs" -domain_name="test.ldc" - -# 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" - -## set some default variables -# -# enable setup of TeX environment -tex_enable="no" - -## services to start (yes) or configure (may) or disable (no) -# -# 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 -# timezone="Europe/Berlin" - -# 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 passed via dhcp option) -start_syslog="yes" - -# start cron service -start_cron="no" - -# start at daemon -start_atd="no" - -# simple network management protocol for system monitoring -start_snmp="no" - -# dbus, resource manager , hal (hardware abstraction layer) interoperate -# tighly. There might be little different solutions within each distro -start_dreshal="yes" - -# start alsa sound system -start_alsasound="yes" - -# start ssh server -start_sshd="yes" - -# AFS network filesystem -start_afs="no" -this_cell="uni-freiburg.de" -cell_server="132.230.6.237 132.230.6.236 132.230.6.235" - -# smb protocol service (provide windows file service) -start_samba="may" -netbios_workgroup="dxs-network" - -# automounter home (/local_dir - top level directories only) and source -# (server:/path) -automnt_dir="/home" -automnt_src="$serverip:/home" - -# scratch space on server -scratch="$serverip:/dxs/tmp" - -# configure and start vmware services -vmware="no" -imgsrv="$serverip:/dxs/vmware" - -# 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" diff --git a/installer/ld4-inst b/installer/ld4-inst index 4143fd7a..a686c036 100755 --- a/installer/ld4-inst +++ b/installer/ld4-inst @@ -318,7 +318,7 @@ setup_server () { # copy the client configuration default file and replace root_pw - machine-setup sed -e "s,@@@root_pw@@@,${root_pw}," \ - default_files/machine-setup_default > ${client_conf}-${timestamp} + default_files/machine-setup.default > ${dxs_conf}/${dxs_client_conf}-${timestamp} # creating new configuration files in $dxs_conf # dhcp -- cgit v1.2.3-55-g7522