From 8ae21107e965d2feba52dad34c4475e72e6dedd5 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Mon, 22 Dec 2008 23:04:01 +0000
Subject: Some smaller cleanups within the stage3 stuff ...

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2453 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/stage3-stuff/etc/functions | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'initramfs/stage3-stuff/etc/functions')

diff --git a/initramfs/stage3-stuff/etc/functions b/initramfs/stage3-stuff/etc/functions
index 69209699..bafd53b4 100644
--- a/initramfs/stage3-stuff/etc/functions
+++ b/initramfs/stage3-stuff/etc/functions
@@ -322,7 +322,7 @@ tftp_get () {
     fi
     tftp -g -r $file -l /tmp/$(basename $file) $file_server
     [ -s /tmp/$(basename $file) ] && download_successful=1
-    countdown=`expr $countdown - 1`
+    countdown=$(expr $countdown - 1)
     usleep 200000
   done
   [ $DEBUGLEVEL -ge 1 ] && \
@@ -390,7 +390,8 @@ $filepath, fileserv:$fileserv" >>$LOGFILE
 ${cfgfile}\n# Hierarchy is distro client and as last distro/default" \
     >>/tmp/confviafile
 fi
-cat /initramfs/machine-setup >>/tmp/confviafile
+cat /initramfs/machine-setup >>/tmp/confviafile 2>/dev/null || \
+  error "$nomachsetup"
 echo "fileget via $fileprot from $fileserv/$cfgfile finished" >/tmp/file-done
 [ $DEBUGLEVEL -ge 1 ] && echo "fileget from $cfgfile finished" >>$LOGFILE
 }
-- 
cgit v1.2.3-55-g7522