Changeset 1863 in MondoRescue

Timestamp:

Jan 16, 2008, 12:00:03 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Try to overcome OpenSuSE stupidity in fstab format (why change again and again !) Ok, it keeps me busy, but I've not need for that anyway :-)
• Increase sleep time after launching udevd to be sure it has time to start (again SuSE issue ?)

Location:

branches/2.2.5/mindi

Files:

• mindi (modified) (2 diffs)
• rootfs/sbin/init (modified) (1 diff)

branches/2.2.5/mindi/mindi

@@ -1422 +1422 @@
             fi
         else
-            str_to_find_fmt_with=$current_partition
+            # Needs to handle the recent OpenSUSE fancy way of dealing with fstab :-(
+            # they use symlinks in fstab unrelated to what is shown in mount !
+            if [ _"$partition_mountpt" = _"" ]; then
+                for tmpp in `tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -Ev "^#" | $AWK '{print $1}'`; do
+                        if [ _"`readlink -f $tmpp`" = "$current_partition" ]; then
+                            str_to_find_fmt_with=$tmpp
+                        fi
+                done
+            else
+                str_to_find_fmt_with=$current_partition
+            fi
         fi
 
@@ -2870 +2880 @@
         LogIt "Hardware Information found and saved ..."
         cp -rp $CACHE_LOC/bkphw .
-        lis=`grep -Ev '^#' $CACHE_LOC/tools.files` 
-        LocateDeps $lis > $MINDI_TMP/tools.lis
-        cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
+        if [ -f $CACHE_LOC/tools.files ]; then
+            lis=`grep -Ev '^#' $CACHE_LOC/tools.files` 
+            LocateDeps $lis > $MINDI_TMP/tools.lis
+            cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
+        fi
         if [ -f $CACHE_LOC/mindi-rsthw ]; then
             mv -f $CACHE_LOC/mindi-rsthw .

branches/2.2.5/mindi/rootfs/sbin/init

@@ -316 +316 @@
     # Depending on udevd version it gives back the hand or not :-(
     /sbin/udevd --daemon &
-    sleep 2
+    sleep 5
     mkdir -p /dev/.udev/queue/
     if [ -x /sbin/udevtrigger ]; then