Changeset 739 in MondoRescue for branches/stable/mindi/rootfs/sbin/init

Timestamp:

Aug 4, 2006, 11:54:47 AM (18 years ago)

Author:

Bruno Cornec

Message:

Fix bug in start-nfs: $ needs to be escaped in that env.

File:

• branches/stable/mindi/rootfs/sbin/init (modified) (4 diffs)

branches/stable/mindi/rootfs/sbin/init

@@ -287 +287 @@
     if [ -e "/tmp/i-want-my-lvm" ] ; then
         LogIt "Scanning LVM's..." 1
-    if which lvm ; then
-        MyInsmod dm-mod
-        MyInsmod dm_mod
-        lvm vgscan --mknodes
-    else
-        vgscan
-    fi
+        if which lvm ; then
+            MyInsmod dm-mod
+            MyInsmod dm_mod
+            lvm vgscan --mknodes
+        else
+            vgscan
+        fi
         grep -E "^#.*vgchange" /tmp/i-want-my-lvm | sed "s/^#[ ]*//" > /tmp/start-lvm
         chmod +x /tmp/start-lvm
@@ -484 +484 @@
 nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg | cut -d' ' -f2-`
 imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
-if [ "$imgname" = "" ]; then
+if [ "\$imgname" = "" ]; then
     imgname="mondorescue"
 fi
 dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
-if [ "$dirimg" = "" ]; then
+if [ "\$dirimg" = "" ]; then
     dirimg="/"
 fi
@@ -494 +494 @@
 # info from cmdline are predominent
 for i in `cat /proc/cmdline` ; do
-    echo $i | grep -qi ping= && ipcount=`echo $i | cut -d= -f2`
-    echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`
-    echo $i | grep -qi nfsmount= && nfsmount=`echo $i | cut -d= -f2`
-    echo $i | grep -qi prefix= && imgname=`echo $i | cut -d= -f2`
+    echo \$i | grep -qi ping= && ipcount=`echo \$i | cut -d= -f2`
+    echo \$i | grep -qi ipconf= && ipconf=`echo \$i | cut -d= -f2`
+    echo \$i | grep -qi nfsmount= && nfsmount=`echo \$i | cut -d= -f2`
+    echo \$i | grep -qi prefix= && imgname=`echo \$i | cut -d= -f2`
 done
 
-if [ $ipdev = "" ] && [ $ipconf = "" ]; then
+if [ \$ipdev = "" ] && [ \$ipconf = "" ]; then
     # No network configuration neither stored during archive
     # nor on cmdline so no network wanted => exiting
@@ -511 +511 @@
 ifconfig lo 127.0.0.1
 
-echo "$ipconf" | grep -q "dhcp"
-if [ $? -eq 0 ]; then
-    ipdev=`echo $ipconf | cut -d: -f1`
-    echo "Making DHCP request on $ipdev"
-    udhcpc -i $ipdev
+echo "\$ipconf" | grep -q "dhcp"
+if [ \$? -eq 0 ]; then
+    ipdev=`echo \$ipconf | cut -d: -f1`
+    echo "Making DHCP request on \$ipdev"
+    udhcpc -i \$ipdev
 else
-    if [ "$ipconf" != "" ]; then
-        ipdev=`echo $ipconf | cut -d: -f1`
-        ipaddress=`echo $ipconf | cut -d: -f2`
-        ipnetmask=`echo $ipconf | cut -d: -f3`
-        ipbroadcast=`echo $ipconf | cut -d: -f4`
-        ipgateway=`echo $ipconf | cut -d: -f5`
+    if [ "\$ipconf" != "" ]; then
+        ipdev=`echo \$ipconf | cut -d: -f1`
+        ipaddress=`echo \$ipconf | cut -d: -f2`
+        ipnetmask=`echo \$ipconf | cut -d: -f3`
+        ipbroadcast=`echo \$ipconf | cut -d: -f4`
+        ipgateway=`echo \$ipconf | cut -d: -f5`
     fi
-    echo "Configuring $ipdev statically ($ipaddress/$ipnetmask)"
-    ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast
-    route add default gw $ipgateway
+    echo "Configuring \$ipdev statically (\$ipaddress/\$ipnetmask)"
+    ifconfig \$ipdev \$ipaddress netmask \$ipnetmask broadcast \$ipbroadcast
+    route add default gw \$ipgateway
 fi
 
 # ping server helps waking interface up
 LogIt "Pinging NFS server..."
-nfs_server_ipaddr=`echo $nfsmount | cut -d: -f1`
-ping -c $ipcount $nfs_server_ipaddr 
+nfs_server_ipaddr=`echo \$nfsmount | cut -d: -f1`
+ping -c \$ipcount \$nfs_server_ipaddr 
 
 # Finally mounts the NFS share
-LogIt "Mounting NFS share ($nfsmount) on /tmp/isodir..."
-mount -t nfs -o nolock $nfsmount /tmp/isodir
-
-LogIt "Mounting NFS image $imgname-1.iso in $dirimg on /mnt/cdrom in loopback"
-losetup /dev/loop7 /tmp/isodir/$dirimg/$imgname-1.iso
+LogIt "Mounting NFS share (\$nfsmount) on /tmp/isodir..."
+mount -t nfs -o nolock \$nfsmount /tmp/isodir
+
+LogIt "Mounting NFS image \$imgname-1.iso in \$dirimg on /mnt/cdrom in loopback"
+losetup /dev/loop7 /tmp/isodir/\$dirimg/\$imgname-1.iso
 mount -o ro -t iso9660 /dev/loop7 /mnt/cdrom
 EOF