Changeset 1158 in MondoRescue for branches/stable/mindi/rootfs

Timestamp:

Feb 14, 2007, 2:32:50 AM (17 years ago)

Author:

Bruno Cornec

Message:

WARNING: Interface change for mondo-restore.cfg: the delimiter between the variable name and its value is now a = (was a ' ')
This change will allow the introduction of the new mr_conf functions

Location:

branches/stable/mindi/rootfs/sbin

Files:

• find-and-mount-cdrom (modified) (2 diffs)
• hack-cfg-if-necessary (modified) (2 diffs)
• init (modified) (3 diffs)
• start-nfs (modified) (1 diff)

branches/stable/mindi/rootfs/sbin/find-and-mount-cdrom

@@ -7 +7 @@
     for device in /dev/hd? /dev/scd? /dev/rcd? /dev/sr? /dev/cd? /dev/ide/*/*/*/*/cd /dev/scsi/*/*/*/*/cd; do
         [ ! "$SECOND_TRY" ] && LogIt "Trying $device"
-        if [ "`grep "using-cdstream yes" /tmp/mondo-restore.cfg`" ]; then
+        if [ "`grep "using-cdstream=yes" /tmp/mondo-restore.cfg`" ]; then
             pwd=`pwd`
             cd $GROOVY
@@ -77 +77 @@
 #mount /dev/fd0u1722 -t ext2 /mnt/floppy
 [ "$1" = "--second-try" ] && exit 1; # don't try to mount floppy drive
-if [ "`grep "using-cdstream yes" /tmp/mondo-restore.cfg`" ] ; then
+if [ "`grep "using-cdstream=yes" /tmp/mondo-restore.cfg`" ] ; then
     LogIt "Because you are using cdstream, I won't try to mount CD."
     exit 0

branches/stable/mindi/rootfs/sbin/hack-cfg-if-necessary

@@ -16 +16 @@
 LogIt "OK, we've found /mnt/cdrom/archives/*; great."
 
-if ! grep "backup-media-type iso" /tmp/mondo-restore.cfg ; then
+if ! grep "backup-media-type=iso" /tmp/mondo-restore.cfg ; then
     LogIt "Config file is fine, BTW."
     exit 0
@@ -23 +23 @@
 LogIt "Re-jigging mondo-restore.cfg because you backed up to ISOs and then burned them to CDs" 1
 mv -f /tmp/mondo-restore.cfg /tmp/mrco
-sed 's/backup-media-type iso/backup-media-type cdr/' /tmp/mrco > /tmp/mondo-restore.cfg
+sed 's/backup-media-type=iso/backup-media-type=cdr/' /tmp/mrco > /tmp/mondo-restore.cfg
 LogIt "Done re-jigging. Yay."
 exit 0

branches/stable/mindi/rootfs/sbin/init

@@ -83 +83 @@
 LoadKeymap() {
     local fname
-    fname=`grep keymap-lives-here /tmp/mondo-restore.cfg | cut -d' ' -f2 2> /dev/null`
+    fname=`grep keymap-lives-here /tmp/mondo-restore.cfg | cut -d'=' -f2 2> /dev/null`
     [ "$fname" = "" ] && return
     if which loadkeys > /dev/null 2> /dev/null ; then
@@ -101 +101 @@
     cd $GROOVY
     [ "$1" != "" ] && tapedev=$1
-    [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg | tr -s ' ' ' ' | cut -d' ' -f2`
+    [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg | tr -s ' ' ' ' | cut -d'=' -f2`
 #    tar -zxf $tapedev
     dd if=$tapedev bs=32k count=1024 | tar -zx
@@ -107 +107 @@
     if [ "$res" -eq "0" ] ; then
     grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg
-    echo "media-dev $tapedev" >> /tmp/mr.cfg
+    echo "media-dev=$tapedev" >> /tmp/mr.cfg
         cp -f /tmp/mr.cfg /tmp/mondo-restore.cfg
     fi

branches/stable/mindi/rootfs/sbin/start-nfs

@@ -11 +11 @@
 
 # Get info from config file
-ipdev=`grep nfs-dev /tmp/mondo-restore.cfg | cut -d' ' -f2-`
-ipaddress=`grep nfs-client-ipaddr /tmp/mondo-restore.cfg | cut -d' ' -f2-`
-ipnetmask=`grep nfs-client-netmask /tmp/mondo-restore.cfg | cut -d' ' -f2-`
-ipbroadcast=`grep nfs-client-broadcast /tmp/mondo-restore.cfg | cut -d' ' -f2-`
-ipgateway=`grep nfs-client-defgw /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+ipdev=`grep nfs-dev /tmp/mondo-restore.cfg | cut -d'=' -f2-`
+ipaddress=`grep nfs-client-ipaddr /tmp/mondo-restore.cfg | cut -d'=' -f2-`
+ipnetmask=`grep nfs-client-netmask /tmp/mondo-restore.cfg | cut -d'=' -f2-`
+ipbroadcast=`grep nfs-client-broadcast /tmp/mondo-restore.cfg | cut -d'=' -f2-`
+ipgateway=`grep nfs-client-defgw /tmp/mondo-restore.cfg | cut -d'=' -f2-`
 ipconf=""
-export nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg | cut -d' ' -f2-`
-export imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+export nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg | cut -d'=' -f2-`
+export imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d'=' -f2-`
 if [ "$imgname" = "" ]; then
     export imgname="mondorescue"
 fi
-export dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+export dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d'=' -f2-`
 if [ "$dirimg" = "" ]; then
     export dirimg="/"