comments, bugfix.

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

3 files changed, 30 insertions, 12 deletions

diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 22393e16..9ce5cd75 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -10,7 +10,7 @@
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
 #
-# Version:      0.3.1d
+# Version:      0.3.1e
 
 # local functions used within hwautocfg
 displaysetup () {
@@ -426,8 +426,8 @@ waitfor /tmp/fscmpl 40000
 # postpone some commands into normal bootup environment
 echo -e "\t# entry added by $0: $date" \
   >>/mnt/etc/${D_INITDIR}/boot.ld
-# cdrom/dvd und plattenkonfig. ergaenzen. Module sind hier geladen und
-# devices sind klar
+# get idea of availabe harddisk partitions, put swap partitions into
+# (/mnt)/etc/fstab and format and mount partitions of type 44 (unknown) 
 for hd in $(cat /tmp/hwsetup.info|sed -n -e '/HD$/,/device:/p'| \
     sed -n -e '/device:/p' | sed -e 's/device: //') ; do
   fdisk -l /dev/$hd| sed -n "/^\/dev\//p" > /tmp/hd_part
@@ -438,6 +438,7 @@ for hd in $(cat /tmp/hwsetup.info|sed -n -e '/HD$/,/device:/p'| \
   # we use special non assigned partition type for harddisk scratch space
   for hdpartnr in $(cat /tmp/hd_part | \
         sed -n -e "/ 44 /p"|sed -e "s/[[:space:]].*//") ; do
+    # ugly message from ext2 mount :-(
     ( mkfs.ext2 -q $hdpartnr; mount -n $hdpartnr /mnt/tmp; \
       echo "finished" > /tmp/tmpready ) &
     echo -e "$hdpartnr\t/tmp\t\text2\t\tdefaults\t 0 0" >> /mnt/etc/fstab
@@ -445,6 +446,7 @@ for hd in $(cat /tmp/hwsetup.info|sed -n -e '/HD$/,/device:/p'| \
     break
   done      
 done
+# determine if tmp preparation should wait for format/mount or not
 [ -z "$part44" ] && echo "finished" > /tmp/tmpready
 
 # run localizator and configure keyboard and console fonts
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index d258836f..6f4f44ae 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -4,7 +4,7 @@
 #		for linux diskless clients (executed within initial
 #		ramdisk) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 07-03-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 09-03-2006
 #		Blabla
 #		Blub
 #
@@ -52,7 +52,8 @@ data via dhcp until now ..." nonfatal
 waitfor /tmp/ldap-done 10000 || error "  Did not get any configuration \
 data via dhcp until now ..." nonfatal
 . /etc/machine-setup
-# hack for replacing variables in machine-setup
+# hack for replacing variables ($serverip, $clientip, $host_name) in 
+# machine-setup
 sed -e "s/\$serverip/$serverip/" -e "s/\$clientip/$clientip/" \
   /etc/machine-setup > /etc/machine-setup.new
 cp /etc/machine-setup.new /etc/machine-setup
@@ -320,6 +321,17 @@ fi
 config_nscd
 
 #######################################################################
+# preparation of /tmp directory (partition 44, nfs scratch, ramdisk)
+# waitfor /tmp/tmpready
+
+# the following should be moved here from X11 ...
+#           /tmp/.ICE-unix \
+#           /tmp/.X11-unix; do testmkd /mnt/$i; done
+#             chmod a+rwxt /mnt/tmp/.ICE-unix
+#               chmod a+rwxt /mnt/tmp/.X11-unix
+               
+
+#######################################################################
 # vmware stuff: two scenarios
 # * VM images in /usr/share/vmware - then simply link
 # * VM images via additional mount (mount source NFS, NBD, ...)
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"