Changeset 739 in MondoRescue

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.

Location:

branches/stable/mindi

Files:

• mindi (modified) (5 diffs)
• rootfs/sbin/init (modified) (4 diffs)
• rootfs/sbin/post-init (modified) (1 diff)

branches/stable/mindi/mindi

@@ -1445 +1445 @@
             items=0
             for i in `tr -s ' ' '\t' < /proc/swaps | grep -Fv "Filename" | cut -f3` ; do
-            totalsize=$(($totalsize+$i))
-            items=$(($items+1))
+                totalsize=$(($totalsize+$i))
+                items=$(($items+1))
             done
-                    [ "$items" -gt "0" ] && partition_size=$(($totalsize/$items)) || partition_size=0
+            [ "$items" -gt "0" ] && partition_size=$(($totalsize/$items)) || partition_size=0
             [ "$partition_size" -lt "125000" ] && partition_size=125000
             echo "I'm guessing $c_p is $(($partition_size/1024))MB" >> $LOGFILE
@@ -1458 +1458 @@
     if [ "$partition_mountpt" = "" ] ; then
         if [ "`pvdisplay $current_lvolume 2> /dev/null`" != "" ] || [ "`lvm pvdisplay $current_lvolume 2> /dev/null`" != "" ] ; then
-        if  [ "`grep -F device /etc/raidtab 2> /dev/null | grep -w $current_partition`" ] ; then
-            partition_mountpt="raid"
-            partition_format="raid"
-        else
-#           lvm_dev="`pvdisplay $current_lvolume | grep -i "VG N" | head -n1 | tr -s ' ' ' ' | cut -d' ' -f3`"
-            partition_mountpt="lvm"
-            partition_format="lvm"
-        fi
+            if  [ "`grep -F device /etc/raidtab 2> /dev/null | grep -w $current_partition`" ] ; then
+                partition_mountpt="raid"
+                partition_format="raid"
+            else
+#               lvm_dev="`pvdisplay $current_lvolume | grep -i "VG N" | head -n1 | tr -s ' ' ' ' | cut -d' ' -f3`"
+                partition_mountpt="lvm"
+                partition_format="lvm"
+            fi
         fi
     fi
@@ -1473 +1473 @@
     if [ "`echo " $IMAGE_DEVS " | grep -F " $current_partition "`" != "" ] ; then
         partition_mountpt="image"
-            old_partition_fmt=$partition_format
+        old_partition_fmt=$partition_format
 #       partition_format="`$FDISK -l 2>> $LOGFILE | tr -s '\t' ' ' | grep -w "$absolute_partition" | $AWK 'x=$(NF-1}'`"
         partition_format="`$FDISK -l 2>> $LOGFILE | tr '*' ' ' | tr '+' ' ' | tr -s ' ' '\t' | grep -w "$absolute_partition" | cut -f5`"
-            echo "------- $FDISK -l log ------------" >> $LOGFILE
-            cat $FDISKLOG >> $LOGFILE
-            echo "------- $FDISK log end ------------" >> $LOGFILE
+        echo "------- $FDISK -l log ------------" >> $LOGFILE
+        cat $FDISKLOG >> $LOGFILE
+        echo "------- $FDISK log end ------------" >> $LOGFILE
         partition_size=$(($partition_size+1)); # just in case
-            if [ "$partition_format" = "Linux" ] ; then
-                echo "Are you imaging a mounted swap partition? Silly..." >> $LOGFILE
-                echo "Reverting format from $old_partition_fmt to $partition_format" >> $LOGFILE
-                partition_format=$old_partition_fmt
-            fi
-    fi
-        if [ "$EXCLUDE_DEVS" ] && [ "`echo " $EXCLUDE_DEVS " | grep -F " $current_partition "`" ] || [ "`echo " $EXCLUDE_DEVS " | grep " $current_partition "`" ] ; then
-            echo "Excluding $current_partition from mountlist" >> $LOGFILE
-            continue
-        fi
-        if [ ! "$partition_mountpt" ] ; then
+        if [ "$partition_format" = "Linux" ] ; then
+            echo "Are you imaging a mounted swap partition? Silly..." >> $LOGFILE
+            echo "Reverting format from $old_partition_fmt to $partition_format" >> $LOGFILE
+            partition_format=$old_partition_fmt
+        fi
+    fi
+    if [ "$EXCLUDE_DEVS" ] && [ "`echo " $EXCLUDE_DEVS " | grep -F " $current_partition "`" ] || [ "`echo " $EXCLUDE_DEVS " | grep " $current_partition "`" ] ; then
+        echo "Excluding $current_partition from mountlist" >> $LOGFILE
+        continue
+    fi
+    if [ ! "$partition_mountpt" ] ; then
         for qq in "" `find /dev/ida/c*d* ! -name '*p*'` ; do
-        partition_format=`$FDISK -l $qq 2>> $LOGFILE | grep -w "$c_p" | sed 's/12/|/' | tr -s '\t' ' ' | cut -d'|' -f2 | cut -d' ' -f2-9`
-                echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
-                cat $FDISKLOG >> $LOGFILE
-                echo "------- $FDISK log end ------------" >> $LOGFILE
-        [ "$partition_format" ] && break
+            partition_format=`$FDISK -l $qq 2>> $LOGFILE | grep -w "$c_p" | sed 's/12/|/' | tr -s '\t' ' ' | cut -d'|' -f2 | cut -d' ' -f2-9`
+            echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
+            cat $FDISKLOG >> $LOGFILE
+            echo "------- $FDISK log end ------------" >> $LOGFILE
+            [ "$partition_format" ] && break
         done
         if [ "$partition_format" = "Compaq diagnostics" ] ; then
-        partition_format="compaq"
+            partition_format="compaq"
         elif [ ! "`grep -F device /etc/raidtab 2> /dev/null | grep -w $current_partition`" ] ; then
-        LogIt "Unable to find mountpoint of $current_partition - ignoring\n"
-        continue
+            LogIt "Unable to find mountpoint of $current_partition - ignoring\n"
+            continue
         fi
     fi
@@ -1519 +1519 @@
             echo "Unknown mountpoint (outstring = $unofficial_outstring)" >> $LOGFILE
         fi
-        elif [ "$partition_format" = "" ] ; then
+    elif [ "$partition_format" = "" ] ; then
         echo "Unknown format (outstring = $unofficial_outstring)" >> $LOGFILE
     elif [ "$partition_size" = "" ] ; then
@@ -1526 +1526 @@
         continue
     else
-            if [ "$partition_format" = "dos" ] || [ "$partition_format" = "msdos" ] ; then
-                echo "Stupid bastard..." >> $LOGFILE
-                partition_format="vfat"
-            fi
+        if [ "$partition_format" = "dos" ] || [ "$partition_format" = "msdos" ] ; then
+            echo "Stupid bastard..." >> $LOGFILE
+            partition_format="vfat"
+        fi
         printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label"
         printf "%s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" >> $mountlist

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

branches/stable/mindi/rootfs/sbin/post-init

@@ -72 +72 @@
 else
     if [ "$iso$nuke$compare$interactive" != "" ] ; then
-    LogIt "FYI, this CD was made by Mindi, not Mondo." 1
-    exit 0
-
+        LogIt "FYI, this CD was made by Mindi, not Mondo." 1
+        exit 0
     else
-    LogIt "Mindi-Linux has finished booting."
+        LogIt "Mindi-Linux has finished booting."
     fi
 fi