Changeset 1698


Ignore:
Timestamp:
Oct 22, 2007, 1:33:59 AM (12 years ago)
Author:
bruno
Message:

Add USB support at restore time (no test done yet). New start-usb script
PB varibale added where useful

Location:
branches/2.2.5
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/install.sh

    r1682 r1698  
    7979chmod 755 $locallib/mindi/aux-tools/sbin/*
    8080
    81 # Substirute variables for init
    82 perl -pi -e "s~^MINDI_VER=VVV~MINDI_VER=$MINDIVER~ ; s~^MINDI_REV=RRR~MINDI_REV=$MINDIREV~" $locallib/mindi/rootfs/sbin/init
    83 
    8481# Substitute variables for mindi
    85 sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$sublocal~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^MINDI_VER=VVV~MINDI_VER=$MINDIVER~" -e "s~^MINDI_REV=RRR~MINDI_REV=$MINDIREV~" -e "s~^MINDI_LIB=LLL~MINDI_LIB=$sublocallib~" mindi > $local/sbin/mindi
     82sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$sublocal~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^MINDI_LIB=LLL~MINDI_LIB=$sublocallib~" mindi > $local/sbin/mindi
    8683chmod 755 $local/sbin/mindi
    8784install -m 755 parted2fdisk.pl $local/sbin
  • branches/2.2.5/mindi/mindi

    r1696 r1698  
    10921092    [ "$TAPESIZE" ]     && echo "media-size $TAPESIZE" >> $outfile
    10931093    [ "$TAPEDEV" ]          && echo "media-dev $TAPEDEV" >> $outfile
     1094    [ "$USBDEVICE" ]            && echo "usb-dev $USBDEVICE" >> $outfile
    10941095    [ "$FILES_IN_FILELIST" ]    && echo "files-in-filelist $FILES_IN_FILELIST" >> $outfile
    10951096    [ "$LAST_FILELIST_NUMBER" ] && echo "last-filelist-number $LAST_FILELIST_NUMBER" >> $outfile
  • branches/2.2.5/mindi/rootfs/sbin/init

    r1643 r1698  
    439439# ------------------------ main -----------------------
    440440
    441 MINDI_VER=VVV
    442 MINDI_REV=RRR
     441MINDI_VER=PBVER
     442MINDI_REV=PBREV
    443443trap CaughtSoftReset SIGTERM
    444444LOGFILE=/var/log/mondorestore.log
     
    475475fi
    476476
    477 if [ "`grep -i 'tape ' /tmp/mondo-restore.cfg`" ] || [ "`grep -i udev /tmp/mondo-restore.cfg`" ] ; then
     477if [ "`grep -i 'tape ' /tmp/mondo-restore.cfg`" ] || [ "`grep -i udev /tmp/mondo-restore.cfg`" ]; then
    478478    HandleTape
    479479    ExtractDataDisksAndLoadModules
     
    481481    # We need to get here exported variables from start-nfs
    482482    . /sbin/start-nfs
     483
     484    # Simulate a local CD
     485    echo "/mnt/cdrom" > /tmp/CDROM-LIVES-HERE
     486    CD_MOUNTED_OK=yes
     487    ExtractDataDisksAndLoadModules
     488elif [ "`grep -i usb= /proc/cmdline`" ] || [ "`grep -i usb /tmp/mondo-restore.cfg | grep media-type`" ]; then
     489    # We need to get here exported variables from start-nfs
     490    . /sbin/start-usb
    483491
    484492    # Simulate a local CD
  • branches/2.2.5/mondo/configure.in

    r1695 r1698  
    7272        AC_CHECK_LIB(pthread, pthread_create, true, [echo "*** Cannot find -lpthread."; echo "*** Please make sure you have the linuxthreads glibc add-on installed."; exit 1])
    7373        PTHREAD="-lpthread"
    74         CFLAGS="$CFLAGS -Wall -Wno-missing-noreturn -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
     74        CFLAGS="$CFLAGS -Wall -Wnoreturn-type -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
    7575        ;;
    7676    *)
  • branches/2.2.5/pbconf/mondo/ebuild/mondo-rescue.ebuild

    r1683 r1698  
    4040    elibtoolize
    4141    econf || die "Configuration failed"
    42     emake VERSION=VVV || die "Make failed"
     42    emake VERSION=PBVER || die "Make failed"
    4343}
    4444
Note: See TracChangeset for help on using the changeset viewer.