summaryrefslogtreecommitdiffstats
path: root/initramfs/stage3-stuff/etc/functions
diff options
context:
space:
mode:
authorDirk von Suchodoletz2008-12-23 00:04:01 +0100
committerDirk von Suchodoletz2008-12-23 00:04:01 +0100
commit8ae21107e965d2feba52dad34c4475e72e6dedd5 (patch)
tree37ed7e94af58f2203e36e4ec235abe96c8c36a1a /initramfs/stage3-stuff/etc/functions
parentThe rdate applet uses a time server which does not need to be (diff)
downloadcore-8ae21107e965d2feba52dad34c4475e72e6dedd5.tar.gz
core-8ae21107e965d2feba52dad34c4475e72e6dedd5.tar.xz
core-8ae21107e965d2feba52dad34c4475e72e6dedd5.zip
Some smaller cleanups within the stage3 stuff ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2453 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/stage3-stuff/etc/functions')
-rw-r--r--initramfs/stage3-stuff/etc/functions5
1 files changed, 3 insertions, 2 deletions
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
}