forgot to copy the new location of machine.setup and corresponding stuff

...



git-svn-id: http://svn.openslx.org/svn/openslx/ld4@130 95ad53e4-c205-0410-b2fa-d234c58c8868

5 files changed, 127 insertions, 12 deletions

diff --git a/installer/default_files/machine-setup_default b/installer/default_files/machine-setup_default
new file mode 100644
index 00000000..24e754c5
--- /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 <dirk@goe.net>, 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='$2a$10$MoEYhIPZGCtR62R8UvBl3emNn2qMOuQpLQpfmNnhya4bGLhyF0pbu'
+
+## 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/distro-specs/config-debian b/installer/distro-specs/config-debian
index 20a376bd..7284def8 100644
--- a/installer/distro-specs/config-debian
+++ b/installer/distro-specs/config-debian
@@ -1,6 +1,7 @@
 dhcpd_conf="/etc/dhcp3/dhcpd.conf"
 atftpd_conf="/etc/default/atftpd"
 exports_conf="/etc/exports"
+client_conf="/etc/dxs/client.cfg/machine-setup.default"
 
 # this variable choses which atftpd template file to chose
 atftpd_conf_name="atftpd_default"
diff --git a/installer/distro-specs/config-suse b/installer/distro-specs/config-suse
index 169ad716..26e43959 100644
--- a/installer/distro-specs/config-suse
+++ b/installer/distro-specs/config-suse
@@ -1,6 +1,7 @@
-dhcpd_conf="/etc/dhcp3/dhcpd.conf"
-atftpd_conf="/etc/default/atftpd"
+dhcpd_conf="/etc/dhcpd.conf"
+atftpd_conf="/etc/sysconfig/atftpd"
 exports_conf="/etc/exports"
+client_conf="/etc/dxs/client.cfg/machine-setup.default"
 
 # this variable choses which atftpd template file to chose
 atftpd_conf_name="atftpd_sysconfig"
diff --git a/installer/distro-specs/config-ubuntu b/installer/distro-specs/config-ubuntu
index 20a376bd..7284def8 100644
--- a/installer/distro-specs/config-ubuntu
+++ b/installer/distro-specs/config-ubuntu
@@ -1,6 +1,7 @@
 dhcpd_conf="/etc/dhcp3/dhcpd.conf"
 atftpd_conf="/etc/default/atftpd"
 exports_conf="/etc/exports"
+client_conf="/etc/dxs/client.cfg/machine-setup.default"
 
 # this variable choses which atftpd template file to chose
 atftpd_conf_name="atftpd_default"
diff --git a/installer/ld4-inst b/installer/ld4-inst
index 05382d89..4407a708 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -3,7 +3,9 @@
 # Description:  Script for generating dxs filesystem by
 #               cloning from rsync source for Diskless X Stations (v4.0)
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 02-11-2005
+# Author(s):    Nico Dietrich
+#		Dirk von Suchodoletz <dirk@goe.net>, 02-11-2005
+#
 # Copyright:    (c) 2003, 2005 - RZ Universitaet Freiburg
 #
 
@@ -98,7 +100,7 @@ distro_check() {
   esac
 }
 
-
+# what do we do here??
 configure() {
   export LANG="c"
 
@@ -113,7 +115,7 @@ configure() {
   fi
   . .config
 
-  # FIXME!! network autodetection seems not to work
+  # FIXME!! network autodetection seems not to work correctly
   if ! [ -z "${netmask}" -a -z "${broadcast}" -a -z "${netname}" -a -z "${server}" ] ; then
     ipcfg=( `ifconfig eth0 | grep "inet addr" | sed -e "s,[a-zA-Z]*:,,g"` )
     netmask=${ipcfg[3]}
@@ -177,7 +179,8 @@ configure() {
   # noetig??
   ask "Broadcast Address: " broadcast $broadcast
 
-  # evtl. optional?
+  # evtl. optional? --> besser in ein komplett eigenes Setup-Skript fuer
+  # machine-setup
   ask "Where automount home directories from? (A.B.C.D:/home-dir)" amt $server":/home"
 
   # more information here!! set useful default
@@ -197,7 +200,8 @@ configure() {
   # nfs / nbd / squash-fs?
 
 
-  # password for pxeboot-menu (caution: you can easily retrieve it in clear text!!)
+  # password for pxeboot-menu (caution: you can easily retrieve it in clear
+  # text!!)
   pxe_passwd="master"
 }
 
@@ -265,10 +269,14 @@ setup_server () {
   timestamp=`date +%Y%m%d-%H%M`
 
   # creating central dxs configuration directory structure if it doesn't exist
-  for dir in dhcp nfs atftpd pxelinux ; do
+  for dir in dhcp nfs atftpd pxelinux client.cfg ; do
     [ -d ${dxs_conf}/${dir} ] || mkdir -p ${dxs_conf}/${dir}
   done
 
+  # copy the client configuration default file - machine-setup
+  cp default_files/machine-setup_default \
+    ${client_conf}
+
   # creating new configuration files in $dxs_conf  
   # dhcp
   sed -e "s,@@@server@@@,${server},g;s,@@@netname@@@,${netname},g;s,@@@netmask@@@,${netmask},g;s,@@@broadcast@@@,${broadcast},g" default_files/dhcpd.conf > ${dxs_conf}/${dxs_dhcpd_conf}-${timestamp}
@@ -277,7 +285,7 @@ setup_server () {
   # atftpd
   sed -e "s,@@@tftpbootdir@@@,${tftpbootdir}," default_files/${atftpd_conf_name} > ${dxs_conf}/${dxs_atftpd_conf}-${timestamp}
 
-   # nfs
+  # nfs
   echo -e "# Bla Blub\n \
   # NFS export entry for DXS\n\
   ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" >> ${dxs_conf}/${dxs_exports_conf}-${timestamp}
@@ -309,7 +317,9 @@ setup_server () {
   
   
   # backing up original files
-  for cfile in ${dhcpd_conf} ${atftpd_conf} ${exports_conf} ${tftpbootdir}/${pxedefault_conf} ; do
+  for cfile in \
+    ${dhcpd_conf} ${atftpd_conf} ${exports_conf} \
+    ${tftpbootdir}/${pxedefault_conf} ${client_conf} ; do
     if [ -f ${cfile} -a ! -L ${cfile} ] ; then
       echo "Copying old ${cfile} to ${cfile}.original"
       mv ${cfile} ${cfile}.original
@@ -332,9 +342,9 @@ footer() {
   echo -e "\nPlease assure to restart atftpd, nfs-kernel-server and dhcpd!\n"
   echo -e "\nInstallation finished.\n"
 
-  # TODO: tell user things he's got to configure aftewards - point to README
+  # TODO: tell user things he's got to configure afterwards - point to README
   #  * in dhcpd.conf - put in clients mac and ip addresses
-  #  * make services start
+  #  * make services start (automatically at server boot)
 
 }