Changeset 1939 in MondoRescue for branches/stable/mindi/mindi

Timestamp:

May 17, 2008, 1:29:54 AM (16 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1923:1938 $SVN_M/branches/2.2.6

File:

• branches/stable/mindi/mindi (modified) (16 diffs)

branches/stable/mindi/mindi

@@ -108 +108 @@
 
 BOOT_MEDIA_MESSAGE="$mindi_boot_msg"
-
 FDISK=$MINDI_SBIN/parted2fdisk
 
@@ -172 +171 @@
 
     mkdir -p $bigdir/etc
-    #cp --parents -pRdf $mappath $bigdir 2>> $LOGFILE || LogIt "AKMF -- Could not copy $mappath to $bigdir"
     tar cf - $mappath 2>> /dev/null | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir"
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
@@ -282 +280 @@
                 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?"
                 tar cf - $incoming 2> /dev/null | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
     
@@ -299 +296 @@
         incoming=`ReadLine`
     done
-}
-
-
-CopyImageToDisk() {
-    local image dev procno res comment
-    image=$1
-    dev=$2
-    comment=$3
-    [ ! -f "$image" ] && [ ! -b "$image" ] && Die "Image $image does not exist. Did you run out of disk space?"
-    Prompt "About to write $comment. Please press ENTER."
-    echo -en "Formatting disk..."
-    if which fdformat > /dev/null ; then
-        fdformat -n $dev > /dev/null 2> /dev/null || Die "Cannot format $dev - is your Linux distro broken?"
-    elif which superformat > /dev/null ; then
-        superformat $dev > /dev/null 2> /dev/null || Die "Cannot format $dev - is your Linux distro broken?"
-    else
-        Die "Please install either fdformat or superformat."
-    fi
-    echo -en "\nWriting $comment"
-    if echo $image | grep "mindi-[r|b]oot\.1440" &> /dev/null ; then
-        cat $image > $dev &
-    else
-        dd if=$image of=$dev &> /dev/null &
-    fi
-    procno=$!
-    ps $procno > /dev/null 2> /dev/null
-    while [ "$?" -eq "0" ] ; do
-        sleep 3
-        echo -en "."
-        ps $procno > /dev/null 2> /dev/null
-    done
-    echo -e "$DONE"
-    LogIt "$comment has been written."
 }
 
@@ -1439 +1403 @@
     MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
     cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/iso/isolinux/vmlinuz). Did you run out of disk space?"
-    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE
+    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to $MINDI_TMP/iso/isolinux/initrd.img. Did you run out of disk space?"
     if [ _"$MONDO_SHARE" != _"" ]; then 
-        cp $kernelpath $MONDO_ROOT/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"/dev/null 
-        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
-
+        cp $kernelpath $MONDO_ROOT/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
+        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to $MONDO_ROOT/initrd.img. Did you run out of disk space?"
     fi
     [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
@@ -1960 +1923 @@
         cd $MINDI_TMP
         for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
-            #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
                 tar cf - $i 2>> $LOGFILE | (cd $bigdir ; tar xf -)
             else
@@ -1975 +1936 @@
             for k in $j ; do
                 if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
-                    #cp --parents -pRdf $k $bigdir 2>> $LOGFILE
                     tar cf - $k 2>> $LOGFILE | (cd $bigdir ; tar xf -)
                 else
@@ -2352 +2312 @@
         s=`which $w 2> /dev/null`
         if [ -e "$s" ] ; then
-            #cp --parents -af $s . 2>> $LOGFILE
             tar cf - $s 2> /dev/null | tar xf -
         fi
@@ -2362 +2321 @@
     file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
     if [ $? -eq 0 ]; then
-        # We want to use the real mount
-        rm -f bin/mount
-        LocateDeps $MINDI_LIB/rootfs/bin/busybox /bin/mount > $MINDI_TMP/busy.lis
-        #cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
-        tar cf - /bin/mount `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf -
+        # We want to use the real mount and all the supported variants (nfs, cifs, ...)
+        rm -f bin/mount $MINDI_TMP/busy.lis
+        mountlis=`grep mount $DEPLIST_FILE`
+        for f in $MINDI_LIB/rootfs/bin/busybox $mountlis ; do
+            if [ -f $f ]; then
+                LocateDeps $f >> $MINDI_TMP/busy.lis
+            fi
+        done
+        tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf -
         rm -f $MINDI_TMP/busy.lis
     fi
@@ -2376 +2339 @@
         echo "udev device manager found" > $mountpoint/tmp/USE-UDEV
         LogIt "udev device manager found"
-        #cp --parents -Rdf /etc/udev . 2> /dev/null
         tar cf - /etc/udev 2> /dev/null | tar xf -
         # This avoids NIC remapping if on another machine at restore time on Debian at least
         rm -f ./etc/udev/rules.d/z25_persistent-net.rules
-        #cp --parents -Rdf /lib/udev /lib64/udev . 2> /dev/null
         tar cf - /lib*/udev 2> /dev/null | tar xf -
         if [ -x /sbin/udevd ]; then
@@ -2407 +2368 @@
                 fi
             done
-            #cp --parents -Rdf $lis `sort -u $MINDI_TMP/udev.lis` .
             tar cf - $lis `sort -u $MINDI_TMP/udev.lis` 2> /dev/null | tar xf -
             rm -f $MINDI_TMP/udev.lis
@@ -2426 +2386 @@
             lis=`grep -Ev '^#' $MINDI_CACHE/tools.files` 
             LocateDeps $lis > $MINDI_TMP/tools.lis
-            #cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
             tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2> /dev/null | tar xf -
         fi
@@ -2446 +2405 @@
     fi
 
-    #cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
     tar cf - /dev/fd0*[1,2][4,7,8]* 2> /dev/null | tar xf -
 
@@ -2489 +2447 @@
         [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-        #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 using udev and native modprobe
@@ -2501 +2458 @@
 
     # Also copy modules.dep in case of udev so that normal modprobe works
-    #cp --parents -Rpdf /$needed_modules_path/modules.dep $mountpoint 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
     tar cf - /$needed_modules_path/modules.dep 2>/dev/null | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy modules.dep to $mountpoint"
 
@@ -2550 +2506 @@
         ln -sf sbin/init init
         # create cpio image file and unmount loop filesystem
-        find . -print | cpio -o -H newc | gzip -9 > $old_pwd/$rdz_fname 2> /dev/null
+        find . -print | cpio -o -H newc | gzip -9 > $rdz_fname 2> /dev/null
         cd $old_pwd
         umount $mountpoint || Die "Cannot unmount $tempfile"