Changeset 226 for trunk


Ignore:
Timestamp:
Dec 15, 2005, 2:58:31 PM (13 years ago)
Author:
bcornec
Message:

merge -r218:225 $SVN_M/branches/2.05

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/mindi

    r219 r226  
    22092209    if [ -e "$MONDO_HOME/restore-scripts" ] ; then
    22102210        cp -Rdf $MONDO_HOME/restore-scripts/* . 2>> $LOGFILE
    2211         [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MINDI_LIB/restore-scripts"
     2211        [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MONDO_HOME/restore-scripts"
    22122212    fi
    22132213    [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state .
  • trunk/mindi/parted2fdisk.pl

    r197 r226  
    4444    $arch = $ENV{ARCH};
    4545} else {
    46     $arch = `"/bin/arch"`;
     46    $arch = `"uname -m"`;
    4747    chomp($arch);
    4848}
  • trunk/mindi/rootfs/sbin/init

    r219 r226  
    638638            done
    639639        fi
    640         LogIt "Mounting NFS image $imgname-1.iso on /mnt/cdrom in loopback"
    641         losetup /dev/loop7 /tmp/isodir/$imgname-1.iso
     640        dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
     641        if [ "$dirimg" = "" ]; then
     642            imgname="/"
     643        fi
     644        LogIt "Mounting NFS image $imgname-1.iso in $dirimg on /mnt/cdrom in loopback"
     645        losetup /dev/loop7 /tmp/isodir/$dirimg/$imgname-1.iso
    642646        mount -t iso9660 /dev/loop7 /mnt/cdrom
    643647        # Simulate a local CD
     
    678682    cp -af /dev/md2 /dev/md/2 2> /dev/null
    679683fi
    680 export ARCH=`/bin/arch`
     684export ARCH=`uname -m`
    681685WelcomeMessage
    682686# SpaceTests; # Mandrake Linux 8.1 doesn't like this
  • trunk/mondo/mondo/common/libmondo-files.c

    r197 r226  
    10841084           call_program_and_get_last_line_of_output(command));
    10851085    sprintf(command,
    1086             "route -n | grep '^0.0.0.0' | awk '{printf $2}'");
     1086            "route -n | grep '^0.0.0.0' | awk '{print $2}'");
    10871087    asprintf(&nfs_client_defgw,
    10881088           call_program_and_get_last_line_of_output(command));
Note: See TracChangeset for help on using the changeset viewer.