Changeset 1698 in MondoRescue

Timestamp:

Oct 22, 2007, 1:33:59 AM (17 years ago)

Author:

Bruno Cornec

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:

• mindi/install.sh (modified) (1 diff)
• mindi/mindi (modified) (1 diff)
• mindi/rootfs/sbin/init (modified) (3 diffs)
• mindi/rootfs/sbin/start-usb (added)
• mondo/configure.in (modified) (1 diff)
• pbconf/mondo/ebuild/mondo-rescue.ebuild (modified) (1 diff)

branches/2.2.5/mindi/install.sh

@@ -79 +79 @@
 chmod 755 $locallib/mindi/aux-tools/sbin/*
 
-# Substirute variables for init
-perl -pi -e "s~^MINDI_VER=VVV~MINDI_VER=$MINDIVER~ ; s~^MINDI_REV=RRR~MINDI_REV=$MINDIREV~" $locallib/mindi/rootfs/sbin/init
-
 # Substitute variables for mindi
-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
+sed -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
 chmod 755 $local/sbin/mindi
 install -m 755 parted2fdisk.pl $local/sbin

branches/2.2.5/mindi/mindi

@@ -1092 +1092 @@
     [ "$TAPESIZE" ]     && echo "media-size $TAPESIZE" >> $outfile
     [ "$TAPEDEV" ]          && echo "media-dev $TAPEDEV" >> $outfile
+    [ "$USBDEVICE" ]            && echo "usb-dev $USBDEVICE" >> $outfile
     [ "$FILES_IN_FILELIST" ]    && echo "files-in-filelist $FILES_IN_FILELIST" >> $outfile
     [ "$LAST_FILELIST_NUMBER" ] && echo "last-filelist-number $LAST_FILELIST_NUMBER" >> $outfile

branches/2.2.5/mindi/rootfs/sbin/init

@@ -439 +439 @@
 # ------------------------ main -----------------------
 
-MINDI_VER=VVV
-MINDI_REV=RRR
+MINDI_VER=PBVER
+MINDI_REV=PBREV
 trap CaughtSoftReset SIGTERM
 LOGFILE=/var/log/mondorestore.log
@@ -475 +475 @@
 fi
 
-if [ "`grep -i 'tape ' /tmp/mondo-restore.cfg`" ] || [ "`grep -i udev /tmp/mondo-restore.cfg`" ] ; then
+if [ "`grep -i 'tape ' /tmp/mondo-restore.cfg`" ] || [ "`grep -i udev /tmp/mondo-restore.cfg`" ]; then
     HandleTape
     ExtractDataDisksAndLoadModules
@@ -481 +481 @@
     # We need to get here exported variables from start-nfs
     . /sbin/start-nfs
+
+    # Simulate a local CD
+    echo "/mnt/cdrom" > /tmp/CDROM-LIVES-HERE
+    CD_MOUNTED_OK=yes
+    ExtractDataDisksAndLoadModules
+elif [ "`grep -i usb= /proc/cmdline`" ] || [ "`grep -i usb /tmp/mondo-restore.cfg | grep media-type`" ]; then
+    # We need to get here exported variables from start-nfs
+    . /sbin/start-usb
 
     # Simulate a local CD

branches/2.2.5/mondo/configure.in

@@ -72 +72 @@
         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])
         PTHREAD="-lpthread"
-        CFLAGS="$CFLAGS -Wall -Wno-missing-noreturn -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
+        CFLAGS="$CFLAGS -Wall -Wnoreturn-type -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
         ;;
     *)

branches/2.2.5/pbconf/mondo/ebuild/mondo-rescue.ebuild

@@ -40 +40 @@
     elibtoolize
     econf || die "Configuration failed"
-    emake VERSION=VVV || die "Make failed"
+    emake VERSION=PBVER || die "Make failed"
 }