X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=linuxrc;h=70eb0e3f614a4236c6e9f01c961740c6392966fc;hb=refs%2Ftags%2F0.73;hp=3ba7a58d1e9eed86dc209f554a3e4d3e45931d4a;hpb=17a7c7c1d0d9af15dfccb2fee3a7ecaa86bcfe2a;p=grml-terminalserver.git diff --git a/linuxrc b/linuxrc index 3ba7a58..70eb0e3 100755 --- a/linuxrc +++ b/linuxrc @@ -526,12 +526,12 @@ if [ -n "$NFS" ]; then KERNELVER=`uname -r` for mod in `find /lib/modules/$KERNELVER/kernel/drivers/net/ -name \*.ko` ; do - echo `basename $mod | tr -d \.ko` >> /modules.load + echo `basename $mod | sed -e 's/\.ko$//'` >> /modules.load done modules_to_load=`cat /modules.load | xargs` # FIXME modprobe is buggy from busybox - log_begin_msg "Trying to load network driver(s)." + log_begin_msg "Trying to load network driver(s)." ; echo modLoad() { for mod in $@ ; do @@ -549,8 +549,8 @@ if [ -n "$NFS" ]; then # loading additional modules modLoad sunrpc lockd af_packet nfs - log_begin_msg "Requesting network configuration using udhcp: " - /static/udhcpc --foreground --quit --script=/static/udhcp-config.sh && echo "$SUCCESS" || echo "$FAILED" + log_begin_msg "Requesting network configuration using udhcp:" ; echo + /static/udhcpc --foreground --quit --script=/static/udhcp-config.sh #echo "press to start a system shell and configure your system" #sh @@ -558,12 +558,12 @@ if [ -n "$NFS" ]; then rdir #rm -rf /myusr /mylib - log_begin_msg "Looking for GRML in: ${MAGENTA}$NFS${NORMAL}" + log_begin_msg "Looking for GRML in: ${MAGENTA}$NFS${NORMAL}" ; echo "$SUCCESS" if mount -t nfs "$NFS" -o "async,ro,nolock" /cdrom #>/dev/null 2>&1 then if test -f /cdrom/$GRML_DIR/$GRML_NAME then - log_begin_msg "Accessing grml CDROM at ${MAGENTA}$NFS${NORMAL}" ; echo " $SUCCESS" + log_begin_msg "Accessing grml CDROM at ${MAGENTA}$NFS${NORMAL}" ; echo "$SUCCESS" FOUND_GRML="$NFS" break fi