"dynamic variables" in machine-setup. mkfs.ext2 in hwautocfg, tmp mount

...



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

3 files changed, 23 insertions, 8 deletions

diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index bf82c2c2..22393e16 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -4,13 +4,13 @@
 #		script for linux diskless clients, using hwconfig from 
 #		knoppix as base tool 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-03-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 09-03-2006
 #		Blabla
 #		Blub
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
 #
-# Version:      0.3.1c
+# Version:      0.3.1d
 
 # local functions used within hwautocfg
 displaysetup () {
@@ -433,17 +433,19 @@ for hd in $(cat /tmp/hwsetup.info|sed -n -e '/HD$/,/device:/p'| \
   fdisk -l /dev/$hd| sed -n "/^\/dev\//p" > /tmp/hd_part
   for hdpartnr in $(cat /tmp/hd_part | \
       sed -n -e "/ 82 /p"|sed -e "s/[[:space:]].*//") ; do
-    echo -e "$hdpartnr\tswap\t\tswap\t\tdefaults\t0 0" >> /mnt/etc/fstab
+    echo -e "$hdpartnr\tswap\t\tswap\t\tdefaults\t 0 0" >> /mnt/etc/fstab
   done
   # 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
-    echo -e "\t( mke2fs -q $hdpartnr; mount -n $hdpartnr /mnt/tmp ) &" \
-      >>/mnt/etc/${D_INITDIR}/boot.ld
-    #
+    ( 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
+    part44=yes
     break
   done      
 done
+[ -z "$part44" ] && echo "finished" > /tmp/tmpready
 
 # run localizator and configure keyboard and console fonts
 DEFKEYTABLE="de-latin1-nodeadkeys"
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index a6ce3793..d258836f 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -52,6 +52,11 @@ 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
+sed -e "s/\$serverip/$serverip/" -e "s/\$clientip/$clientip/" \
+  /etc/machine-setup > /etc/machine-setup.new
+cp /etc/machine-setup.new /etc/machine-setup
+. /etc/machine-setup
 
 #######################################################################
 # set localization
diff --git a/initrd/initrd-stuff/etc/machine-setup b/initrd/initrd-stuff/etc/machine-setup
index 35dc5a9c..0cdae408 100644
--- a/initrd/initrd-stuff/etc/machine-setup
+++ b/initrd/initrd-stuff/etc/machine-setup
@@ -6,13 +6,17 @@
 #		New settings are simply appended, so that they might 
 #		overwrite previously defined variables 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-03-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 09-03-2006
 #		Blabla
 #		Blub
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
 # 
-# format variable="value"
+# 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'
@@ -83,8 +87,12 @@ netbios_workgroup="dxs-network"
 automnt_dir="/home"
 automnt_src="10.8.4.254:/home"
 
+# scratch space on server
+scratch="$serverip:/dxs/tmp"
+
 # configure and start vmware services
 vmware="no"
+imgsrv="$serverip:/dxs/vmware"
 
 start_xdmcp=xdm
 start_x=yes