(hopefully) fixed #71 - please check!

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

4 files changed, 12 insertions, 18 deletions

diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 866ea0d5..64ed8970 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -4,7 +4,7 @@
 #		script for linux diskless clients, using hwconfig from 
 #		knoppix as base tool 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 15-07-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-07-2006
 #		Felix Endres
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
@@ -430,7 +430,8 @@ for hd in $(cat /tmp/hwsetup.info|sed -n -e '/HD$/,/device:/p'| \
         sed -n -e "/ 44 /p"|sed -e "s/[[:space:]].*//") ; do
     # ext2fs_check_if_mount message supressed
     ( mkfs.ext2 -Fq $hdpartnr 2>/dev/null; mount -n -o nocheck,noexec \
-      $hdpartnr /mnt/tmp 2>/dev/null; echo "$hdpartnr" > /tmp/tmpready ) &
+      $hdpartnr /mnt/tmp 2>/dev/null; 
+      echo "$hdpartnr is mounted to /tmp" > /tmp/tmpready ) &
     echo -e "$hdpartnr\t/tmp\t\text2\t\tdefaults\t 0 0" >> /tmp/fstab
     part44=yes
     break
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 1e50b6d7..c645cef6 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -4,8 +4,8 @@
 #               for linux diskless clients (executed within initial
 #               ramdisk) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 16-08-2006
-#               Michael Janczyk, 31-05-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-08-2006
+#               Michael Janczyk <mj0>, 31-05-2006
 #               Lars Mueller <lm@opendiskless.org>, 23-06-2006
 #               Oliver Tappe <ot@opendiskless.org>, 23-06-2006
 #
@@ -334,7 +334,7 @@ fi
 # wait for completion of detection, setup process
 waitfor /tmp/tmpready 10000
 # create some directories and correct permissions
-tmpisdisk=`sed -n '/\/tmp/p' /mnt/etc/fstab`
+tmpisdisk=`sed -n '/\/tmp/p' /tmp/tmpready`
 # if there is no local disk partition for /tmp then try to mount a rw
 # scratch space (if defined in $scratch) and prepared on server
 if [ -n "$scratch" -a -z "$tmpisdisk" ] ; then
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index cc1694b0..22827b01 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -2,7 +2,7 @@
 #               linux diskless clients (included by init, hwautocfg,
 #               servconfig, ... within initial ramdisk) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 17-08-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-08-2006
 #               Felix Endres, 30-04-2006
 #               Tobias Maier
 #
@@ -373,7 +373,7 @@ case "$tftp" in
 esac
 # unpack part (only gzip is supported)
 if [ -s $dst ] ; then
-  tar -xpzf $dst
+  tar -xpzf $dst 2>/dev/null
   [ "$DEBUGLEVEL" -le 2 ] && rm $dst
   return 0
 else
diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default
index a98fec97..dc379389 100644
--- a/installer/default_files/machine-setup.default
+++ b/installer/default_files/machine-setup.default
@@ -6,7 +6,7 @@
 #		New settings are simply appended, so that they might 
 #		overwrite previously defined variables 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 16-08-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-08-2006
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
 # 
@@ -68,22 +68,17 @@ 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)
+# (format (proto://)server/path)
 automnt_dir="/home"
-#automnt_src="$serverip:/home"
+#automnt_src="$serverip/home"
 
 # scratch space on server "proto://serverip/dxs/tmp"
-#scratch="(proto://)serverip:/dxs/tmp"
+#scratch="(proto://)serverip/dxs/tmp"
 
 # configure and start vmware services
 vmware="no"
@@ -102,5 +97,3 @@ dm_allow_shutdown="user"
 # should Xorg/XFree server be started or some special windowmanager be run
 # in kiosk mode e.g. start_x="kde"
 start_x="yes"
-
-