Changeset 2438 in MondoRescue for branches/2.2.9/mindi/mindi

Timestamp:

Sep 29, 2009, 2:41:36 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Improvements on sshfs/ssh management in restore mode
• Include now all minimal requirements for sshfs

File:

• branches/2.2.9/mindi/mindi (modified) (3 diffs)

branches/2.2.9/mindi/mindi

@@ -2256 +2256 @@
         # We want to use the real mount and all the supported variants (nfs, cifs, ...)
         rm -f bin/mount $MINDI_TMP/busy.lis
-        mountlis=`grep -E "mount|fuse|ssh|libnss" $DEPLIST_FILE $DEPLIST_DIR/* | cut -d: -f2`
-        for f in $MINDI_LIB/rootfs/bin/busybox $mountlis ; do
-            if [ -f $f ]; then
-                LocateDeps $f >> $MINDI_TMP/busy.lis
-            fi
+        mountlis=`grep -E "mount|fuse|ssh" $DEPLIST_FILE $DEPLIST_DIR/* | cut -d: -f2 | sort -u`
+        LocateDeps $MINDI_LIB/rootfs/bin/busybox $mountlis >> $MINDI_TMP/busy.lis
+        # Special for libs
+        for f in `grep -E "libnss" $DEPLIST_FILE $DEPLIST_DIR/* | cut -d: -f2`; do
+            echo "`ReadAllLink $f`" >> $MINDI_TMP/busy.lis
         done
+        # Initial / are trucated by tar
         tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in mount analysis" $MINDI_TMP/$$.log
         rm -f $MINDI_TMP/busy.lis
     fi
+
+    # Copy of files mandatory for ssh to automate mount if sshfs is used
+    mkdir $mountpoint/.ssh
+    cp -rp ~root/.ssh/*.pub ~root/.ssh/config ~root/.ssh/known* $mountpoint/.ssh
+    echo > $mountpoint/tmp/myssh << EOF
+ssh -o StrictHostKeyChecking=no $*
+EOF
+    chmod 755 $mountpoint/tmp/myssh
 
     # Copy of files mandatory for ld.so
@@ -2422 +2431 @@
     mkdir -p $mountpoint/proc
     echo "$BOOT_SIZE" > $mountpoint/tmp/$BOOT_SIZE.siz
+
+    echo "---------------------------" >> $LOGFILE
+    echo "Content of initial ramdisk:" >> $LOGFILE
+    echo "---------------------------" >> $LOGFILE
+    (cd $mountpoint ; ls -Rla ) >> $LOGFILE
+    echo "---------------------------" >> $LOGFILE
+
     # Determine what filesystem to use for initrd image
     echo "Call GetInitrdFilesystemToUse() with parameter ${kernelpath} to get filesystem to use for initrd." >> $LOGFILE
@@ -2686 +2702 @@
     elif [ "$1" = "--locatedeps" ] ; then
         [ ! "$2" ] && Die "Please specify the binary to look at"
-        LocateDeps $2
+        LocateDeps $*
         # Avoids logfile content for mondo
         export MONDO_SHARE=""