Changeset 3248 in MondoRescue

Timestamp:

Feb 26, 2014, 10:46:25 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Moves the creation of the symlinks for directories on /bin, /sbin in TurnTgzIntoRdz after mounting the FS so that it's done at the right place now.
• Apply again a patch on mindi to detect correctly kernel version 3 and upper which had disappeared :-(

Location:

branches/3.2

Files:

• mindi/mindi (modified) (10 diffs)
• mondo-doc/mondoarchive.8 (modified) (1 diff)

branches/3.2/mindi/mindi

@@ -1858 +1858 @@
 
 PrepareBootDiskImage_LILO() {
-    local imagesdir dev imagefile mountpoint fname i kernelpath cfg_file testpath options retval outstr old_pwd ooo max_kernel_size liloconf
+    local imagesdir dev imagefile fname i kernelpath cfg_file testpath options retval outstr old_pwd ooo max_kernel_size liloconf
     imagesdir=$MINDI_CACHE
     kernelpath=$1
@@ -1870 +1870 @@
     echo -en "..."
     imagefile=$imagesdir/mindi-bootroot.$BOOT_SIZE.img
-    mountpoint=$MINDI_TMP/mountpoint.$$
     mkdir -p $mountpoint
     dd if=/dev/zero of=$imagefile bs=1k count=$BOOT_SIZE &> /dev/null || Die "Cannot dd blank file"
@@ -1968 +1967 @@
 
 PrepareBootDiskImage_ISOLINUX() {
-    local imagesdir dev imagefile mountpoint fname i kernelpath cfg_file testpath options retval outstr old_pwd ooo max_kernel_size bootimage retval
+    local imagesdir dev imagefile fname i kernelpath cfg_file testpath options retval outstr old_pwd ooo max_kernel_size bootimage retval
     imagesdir=$MINDI_CACHE
     kernelpath=$1
@@ -1980 +1979 @@
     echo -en "..."
     imagefile=$MINDI_TMP/mindi-bootroot.$BOOT_SIZE.img
-    mountpoint=$MINDI_TMP/mountpoint.$$
     mkdir -p $mountpoint
     dd if=/dev/zero of=$imagefile bs=1k count=$BOOT_SIZE &> /dev/null || Die "Cannot dd blank file"
@@ -2098 +2096 @@
     mkdir -p $bigdir/usr/sbin
     includefile=$MINDI_TMP/$$.includefile.txt
-
-    # Check whether /lib64 or /lib or /sbin or /bin is a link and if so explicitly create one in rootfs (Fedora 17 crazyness)
-    for d in bin sbin lib lib64; do
-        if [ -h "/$d" ]; then
-            thelink=`readlink /$d`
-            mkdir -p $mountpoint/$thelink || LogIt "ERROR: Unable to create $thelink in $mountpoint."
-            mv $mountpoint/$d/* $mountpoint/$d/.??* $mountpoint/$thelink 2> /dev/null
-            if [ -d "$mountpoint/$d" -a ! -h "$mountpoint/$d" ]; then
-                rmdir $mountpoint/$d
-            fi
-            if [ ! -h $mountpoint/$d ]; then
-                rm -f $mountpoint/$d 2> /dev/null
-                (cd $mountpoint ; ln -s $thelink $d) || LogIt "ERROR: /$d is a symbolic link, but I couldn't create it in $mountpoint."
-            fi
-        fi
-    done
 
     lfiles=`ls $DEPLIST_DIR/* | grep -v /minimal`
@@ -2343 +2325 @@
         if [ "$?" -eq "0" ] ; then
             # Used by ia64
-            fkern_ver=`gzip -cd $fname | strings 2> /dev/null | grep "[2-9]+*[.][0-9]+*[.][0-9]+*[^\@]*@"`
+            fkern_ver=`gzip -cd $fname | strings 2> /dev/null | grep -E "[2-9]+\.[0-9]+\.[0-9]+[^\@]*@"`
         else
-            fkern_ver=`strings $fname 2> /dev/null | grep "[2-9]+*[.][0-9]+*[.][0-9]+*[^\@]*@"`
+            fkern_ver=`strings $fname 2> /dev/null | grep -E "[2-9]+\.[0-9]+\.[0-9]+[^\@]*@"`
         fi
         echo "$fkern_ver"
@@ -2495 +2477 @@
 
 TurnTgzIntoRdz() {
-    local tgz_dir_fname rdz_fname tempfile mountpoint old_pwd nodes kernelsize maxsize res currsize not_copied j k s w needed_modules_path
+    local tgz_dir_fname rdz_fname tempfile old_pwd nodes kernelsize maxsize res currsize not_copied j k s w needed_modules_path d thelink
 
     tgz_dir_fname=$1
@@ -2503 +2485 @@
     maxsize=$(($maxsize*2)); # to allow for compression of 50%
     tempfile=$MINDI_TMP/temp.rd
-    mountpoint=$MINDI_TMP/mnt1
     res=0
     echo -en "..."
@@ -2517 +2498 @@
     cd "$mountpoint"
 
+    # Check whether /lib64 or /lib or /sbin or /bin is a link and if so explicitly create one in rootfs (Fedora 17 crazyness)
+    for d in bin sbin lib lib64; do
+        if [ -h "/$d" ]; then
+            thelink=`readlink /$d`
+            mkdir -p $mountpoint/$thelink || LogIt "ERROR: Unable to create $thelink in $mountpoint."
+            mv $mountpoint/$d/* $mountpoint/$d/.??* $mountpoint/$thelink 2> /dev/null
+            if [ -d "$mountpoint/$d" -a ! -h "$mountpoint/$d" ]; then
+                rmdir $mountpoint/$d
+            fi
+            if [ ! -h $mountpoint/$d ]; then
+                rm -f $mountpoint/$d 2> /dev/null
+                (cd $mountpoint ; ln -s $thelink $d) || LogIt "ERROR: /$d is a symbolic link, but I couldn't create it in $mountpoint."
+            fi
+        fi
+    done
+    LogFile "INFO: what is now in $mountpoint"
+    ls -alR $mountpoint >> $LOGFILE
     
     # Check files before copying to discover configuration issues or McAfee preventing mindi reading these files
@@ -3334 +3332 @@
 [ "$(($RANDOM%64))" -eq "0" ] && LogIt "INFO: Dude, I've looked inside your computer and it's really dusty..."
 
+mountpoint=$MINDI_TMP/mountpoint.$$
 PrepareDataDiskImages
 

branches/3.2/mondo-doc/mondoarchive.8

@@ -307 +307 @@
 that afio is not free enough due to its age and old licenses (wrongly in our
 opinion). Star can be used to have a better support of sparse file compared to
-afio. Also star supports natively POSIX ACLs, where as afio requires a special 
+afio. Also star supports natively POSIX ACLs, whereas afio requires a special 
 additional handlling.