Changeset 1158 in MondoRescue for branches/stable/mindi


Ignore:
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
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/mindi/mindi

    r1143 r1158  
    517517        echo -en "Adding the following keyboard mapping tables: "
    518518        mkdir -p $bigdir/tmp
    519         echo "keymap-lives-here /etc/console/boottime.kmap.gz" > $MINDI_TMP/mondo-restore.cfg
     519        echo "keymap-lives-here=/etc/console/boottime.kmap.gz" >> $MINDI_TMP/mondo-restore.cfg
    520520        KBDEPTH=0
    521521        mkdir -p $bigdir/etc/console
    … …  
    568568    echo -en "Adding the following keyboard mapping tables: "
    569569    mkdir -p $bigdir/tmp
    570     echo "keymap-lives-here $mappath" > $MINDI_TMP/mondo-restore.cfg
     570    echo "keymap-lives-here=$mappath" >> $MINDI_TMP/mondo-restore.cfg
    571571    KBDEPTH=0
    572572    AddKeyboardMappingFile $mappath
    … …  
    22442244    # master boot record, too
    22452245    if [ _"$MONDORESTORECFG" != _"" ]; then
    2246         i=`grep bootloader.device $MONDORESTORECFG | cut -d' ' -f2 2> /dev/null`
     2246        i=`grep bootloader.device $MONDORESTORECFG | cut -d'=' -f2 2> /dev/null`
    22472247        if [ "$i" ] ; then
    22482248            LogIt "Backing up $i's MBR"
    … …  
    31283128        echo "-----------------------------------" >> $LOGFILE
    31293129
    3130         CDRECOVERY=`grep use-cdrecovery $MONDORESTORECFG | cut -d' ' -f2`
    3131         NOT_BOOT=`grep non-bootable $MONDORESTORECFG | cut -d' ' -f2`
    3132         USE_LILO=`grep use-lilo $MONDORESTORECFG | cut -d' ' -f2`
    3133         EXCLUDE_DEVS=`grep excluded-devs $MONDORESTORECFG | cut -d' ' -f2`
    3134         NFS_DEV=`grep nfs-dev $MONDORESTORECFG | cut -d' ' -f2`
    3135         VALUE=`grep image-devs $MONDORESTORECFG | cut -d' ' -f2`
     3130        CDRECOVERY=`grep use-cdrecovery $MONDORESTORECFG | cut -d'=' -f2`
     3131        NOT_BOOT=`grep non-bootable $MONDORESTORECFG | cut -d'=' -f2`
     3132        USE_LILO=`grep use-lilo $MONDORESTORECFG | cut -d'=' -f2`
     3133        EXCLUDE_DEVS=`grep excluded-devs $MONDORESTORECFG | cut -d'=' -f2`
     3134        NFS_DEV=`grep nfs-dev $MONDORESTORECFG | cut -d'=' -f2`
     3135        VALUE=`grep image-devs $MONDORESTORECFG | cut -d'=' -f2`
    31363136        if [ "$VALUE" = "(null)" ] || [ "$VALUE" = "" ] ; then
    31373137            IMAGE_DEVS=""

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

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

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

    r275 r1158  
    1616LogIt "OK, we've found /mnt/cdrom/archives/*; great."
    1717
    18 if ! grep "backup-media-type iso" /tmp/mondo-restore.cfg ; then
     18if ! grep "backup-media-type=iso" /tmp/mondo-restore.cfg ; then
    1919    LogIt "Config file is fine, BTW."
    2020    exit 0
    … …  
    2323LogIt "Re-jigging mondo-restore.cfg because you backed up to ISOs and then burned them to CDs" 1
    2424mv -f /tmp/mondo-restore.cfg /tmp/mrco
    25 sed 's/backup-media-type iso/backup-media-type cdr/' /tmp/mrco > /tmp/mondo-restore.cfg
     25sed 's/backup-media-type=iso/backup-media-type=cdr/' /tmp/mrco > /tmp/mondo-restore.cfg
    2626LogIt "Done re-jigging. Yay."
    2727exit 0

  • branches/stable/mindi/rootfs/sbin/init

    r1087 r1158  
    8383LoadKeymap() {
    8484    local fname
    85     fname=`grep keymap-lives-here /tmp/mondo-restore.cfg | cut -d' ' -f2 2> /dev/null`
     85    fname=`grep keymap-lives-here /tmp/mondo-restore.cfg | cut -d'=' -f2 2> /dev/null`
    8686    [ "$fname" = "" ] && return
    8787    if which loadkeys > /dev/null 2> /dev/null ; then
    … …  
    101101    cd $GROOVY
    102102    [ "$1" != "" ] && tapedev=$1
    103     [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg | tr -s ' ' ' ' | cut -d' ' -f2`
     103    [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg | tr -s ' ' ' ' | cut -d'=' -f2`
    104104#    tar -zxf $tapedev
    105105    dd if=$tapedev bs=32k count=1024 | tar -zx
    … …  
    107107    if [ "$res" -eq "0" ] ; then
    108108    grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg
    109     echo "media-dev $tapedev" >> /tmp/mr.cfg
     109    echo "media-dev=$tapedev" >> /tmp/mr.cfg
    110110        cp -f /tmp/mr.cfg /tmp/mondo-restore.cfg
    111111    fi

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

    r802 r1158  
    1111
    1212# Get info from config file
    13 ipdev=`grep nfs-dev /tmp/mondo-restore.cfg | cut -d' ' -f2-`
    14 ipaddress=`grep nfs-client-ipaddr /tmp/mondo-restore.cfg | cut -d' ' -f2-`
    15 ipnetmask=`grep nfs-client-netmask /tmp/mondo-restore.cfg | cut -d' ' -f2-`
    16 ipbroadcast=`grep nfs-client-broadcast /tmp/mondo-restore.cfg | cut -d' ' -f2-`
    17 ipgateway=`grep nfs-client-defgw /tmp/mondo-restore.cfg | cut -d' ' -f2-`
     13ipdev=`grep nfs-dev /tmp/mondo-restore.cfg | cut -d'=' -f2-`
     14ipaddress=`grep nfs-client-ipaddr /tmp/mondo-restore.cfg | cut -d'=' -f2-`
     15ipnetmask=`grep nfs-client-netmask /tmp/mondo-restore.cfg | cut -d'=' -f2-`
     16ipbroadcast=`grep nfs-client-broadcast /tmp/mondo-restore.cfg | cut -d'=' -f2-`
     17ipgateway=`grep nfs-client-defgw /tmp/mondo-restore.cfg | cut -d'=' -f2-`
    1818ipconf=""
    19 export nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg | cut -d' ' -f2-`
    20 export imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
     19export nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg | cut -d'=' -f2-`
     20export imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d'=' -f2-`
    2121if [ "$imgname" = "" ]; then
    2222    export imgname="mondorescue"
    2323fi
    24 export dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
     24export dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d'=' -f2-`
    2525if [ "$dirimg" = "" ]; then
    2626    export dirimg="/"
Note: See TracChangeset for help on using the changeset viewer.