Changeset 1914 in MondoRescue

Timestamp:

Apr 15, 2008, 2:24:58 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Complete removal of cp --parents. Now using tar everywhere
• uncompress kernel modules only when not using udev

File:

• branches/2.2.6/mindi/mindi (modified) (15 diffs)

branches/2.2.6/mindi/mindi

@@ -40 +40 @@
 TMPDIR=/tmp
 
-EXTRA_SPACE=32768       # increase if you run out of ramdisk space
+EXTRA_SPACE=49152       # increase if you run out of ramdisk space
 BOOT_SIZE=16384         # size of the boot disk
 MAX_DISKS=99
@@ -168 +168 @@
 
     mkdir -p $bigdir/etc
-    cp --parents -pRdf $mappath $bigdir 2>> $LOGFILE || LogIt "AKMF -- Could not copy $mappath to $bigdir"
+    #cp --parents -pRdf $mappath $bigdir 2>> $LOGFILE || LogIt "AKMF -- Could not copy $mappath to $bigdir"
+    tar cf - $mappath 2>> $LOGFILE | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir"
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
         included_list=`gzip -dc $mappath | grep -Fi include | sed s/'"'// | sed s/'"'// | cut -d' ' -f2`
@@ -203 +204 @@
     [ "`head $scratchfile -n1 | grep -F "bin/sh"`" != "" ] && StripComments $scratchfile "-$filename-"
     [ "`echo "$filename" | grep -F "etc/termcap"`" != "" ] && StripComments $scratchfile "-$filename-"
-    if [ "`echo "$filename" | grep -F "lib/modules/" | grep "\.*o\.gz"`" != "" ] ; then
+
+    # Uncompress modules only if not using udevd
+    if [ "`echo "$filename" | grep -F "lib/modules/" | grep "\.*o\.gz"`" != "" ] && [ "`ps auxww | grep -v grep | grep -qw udevd`" != "" ]; then
         mv $scratchfile $scratchfile.gz
         gunzip -f $scratchfile || LogIt "Cannot gunzip $scratchfile.gz"
@@ -275 +278 @@
                 BIGNO=$(($BIGNO+1))
             else
-                cp --parents -Rdf $incoming $outdir 2> /dev/null || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
-                if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] ; then
+                #cp --parents -Rdf $incoming $outdir 2> /dev/null || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
+                tar cf - $incoming 2> /dev/null | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
+    
+                # Only uncompress modules if not using udevd
+                if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] && [ "`ps auxww | grep -v grep | grep -qw udevd`" != "" ]; then
                     gunzip -f $outdir/$incoming || LogIt "Cannot gunzip $outdir/$incoming"
                 fi
@@ -2059 +2065 @@
         cd $MINDI_TMP
         for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
-            cp --parents -pRdf ./$i $bigdir 2>> $LOGFILE || Die "PDDI can't cp $i->$bigdir"
+            #cp --parents -pRdf ./$i $bigdir 2>> $LOGFILE || Die "PDDI can't cp $i->$bigdir"
+            tar cf - ./$i 2>> $LOGFILE | (cd $bigdir ; tar xf -) || Die "PDDI can't copy $i->$bigdir"
             if [ "`du -sk $i | cut -f1`" -lt "$(($CHOPSIZE*2))" ] ; then
-                cp --parents -pRdf $i $bigdir 2>> $LOGFILE
+                #cp --parents -pRdf $i $bigdir 2>> $LOGFILE
+                tar cf - $i 2>> $LOGFILE | (cd $bigdir ; tar xf -)
             else
                 ChopUpAndCopyFile $i $bigdir $CHOPSIZE $BIGNO
@@ -2072 +2080 @@
             for k in $j ; do
                 if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
-                    cp --parents -pRdf $k $bigdir 2>> $LOGFILE
+                    #cp --parents -pRdf $k $bigdir 2>> $LOGFILE
+                    tar cf - $k 2>> $LOGFILE | (cd $bigdir ; tar xf -)
                 else
                     ChopUpAndCopyFile $k $bigdir $CHOPSIZE $BIGNO
@@ -2131 +2140 @@
         [ "$?" -ne "0" ] && [ _"$MONDO_SHARE" != _"" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
     fi
-    [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state . 2>> $LOGFILE
+    #[ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state . 2>> $LOGFILE
+    [ -d "/lib/dev-state" ] && tar cf - /lib/dev-state 2>> $LOGFILE | tar xf -
     cd $old_pwd
     echo -e "$DONE"
@@ -2437 +2447 @@
     cp -Rdf $tgz_dir_fname/* . 2>&1 >> $LOGFILE
     tar -zxf symlinks.tgz || Die "Cannot untar symlinks.tgz"
+
     cd dev || Die "Can't cd to dev"
     tar -zxf dev-entries.tgz || Die "Cannot untar dev-entries.tgz"
@@ -2450 +2461 @@
     done
 
-    mkdir -p tmp
     [ -e "/dev/.devfsd" ] && echo "/dev/.devfsd found" > tmp/USE-DEVFS
 
@@ -2464 +2474 @@
     fi
 
+    mkdir -p $mountpoint/tmp
     # Management of udev (which includes modprobe in rules)
     ps auxww | grep -v grep | grep -qw udevd
     if [ $? -eq 0 ]; then
-        echo "udev device manager found" > tmp/USE-UDEV
+        echo "udev device manager found" > $mountpoint/tmp/USE-UDEV
         LogIt "udev device manager found"
         #cp --parents -Rdf /etc/udev . 2> /dev/null
@@ -2506 +2517 @@
             echo "udevd daemon not in standard place (/sbin)" 2>&1 | tee -a $LOGFILE
             echo "mindi will use static devices which may cause problems" 2>&1 | tee -a $LOGFILE
-            rm -f tmp/USE-UDEV
+            rm -f $mountpoint/tmp/USE-UDEV
         fi
     fi
@@ -2579 +2590 @@
         needed_modules="$needed_modules `FindSpecificModuleInPath $needed_modules_path $i`"
     done
+
     for i in $needed_modules ; do
         [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
@@ -2585 +2597 @@
         #cp --parents -Rpdf $i $mountpoint 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
         tar cf - $i 2>/dev/null | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy $i to $mountpoint"
-        # Uncompress modules if not useing udev and native modprobe
+        # Uncompress modules if not using udev and native modprobe
         if [ ! -f $mountpoint/tmp/USE-UDEV ]; then
             if [ "`echo "$i" | grep -F ".gz"`" ]; then
+                echo "Uncompressing $i" >> $LOGFILE
                 gunzip -f $mountpoint/$i
-                #i=`echo $i | sed 's/.gz//'`
             fi
         fi
@@ -2598 +2610 @@
     tar cf - /$needed_modules_path/modules.dep 2>/dev/null | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy modules.dep to $mountpoint"
 
-    # For all modules supported, create symlinks under the mountpoint
-    for i in $EXTRA_MODS $NET_MODS $SCSI_MODS; do 
-        all_modules="$all_modules `FindSpecificModuleInPath $mountpoint $i | sed 's~^$mountpoint/~~g'`"
-    done
     if [ ! -e "/sbin/devfsd" ] || [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] ; then
         echo "Deleting devfsd daemon from ramdisk" >> $LOGFILE
@@ -2612 +2620 @@
     dd if=/dev/zero of=$mountpoint/zero &> /dev/null
     rm -f $mountpoint/zero
-    mkdir -p $mountpoint/tmp
     if [ _"$MONDO_SHARE" != _"" ]; then
         MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg