projects
/
grml-terminalserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
/linuxrc: replace tr with sed command, thanks for the fix -
[grml-terminalserver.git]
/
linuxrc
diff --git
a/linuxrc
b/linuxrc
index
3ba7a58
..
70eb0e3
100755
(executable)
--- 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
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
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
modLoad()
{
for mod in $@ ; do
@@
-549,8
+549,8
@@
if [ -n "$NFS" ]; then
# loading additional modules
modLoad sunrpc lockd af_packet nfs
# 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 <enter> to start a system shell and configure your system"
#sh
#echo "press <enter> to start a system shell and configure your system"
#sh
@@
-558,12
+558,12
@@
if [ -n "$NFS" ]; then
rdir
#rm -rf /myusr /mylib
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
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
FOUND_GRML="$NFS"
break
fi