Changeset 1909 in MondoRescue

Timestamp:

Apr 14, 2008, 1:18:58 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Remove stalled links at root of the restore media
• Suppress some compiler warnings

Location:

branches/2.2.6

Files:

• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-mountlist.c (modified) (3 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/2.2.6/mindi/mindi

@@ -2602 +2602 @@
         all_modules="$all_modules `FindSpecificModuleInPath $mountpoint $i | sed 's~^$mountpoint/~~g'`"
     done
-    for i in $all_modules; do
-        (cd $mountpoint ; ln -s $i . 2>/dev/null)
-    done
     if [ ! -e "/sbin/devfsd" ] || [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] ; then
         echo "Deleting devfsd daemon from ramdisk" >> $LOGFILE

branches/2.2.6/mondo/src/common/libmondo-mountlist.c

@@ -952 +952 @@
 #if linux
         sscanf(incoming,
-               "%s %s %s %s %s %s",
+               "%s %s %s %s %s",
                mountlist->el[items].device,
                mountlist->el[items].mountpoint,
@@ -1012 +1012 @@
 
             sprintf(tmp,
-                    "%s %s %s %lld %s %s",
+                    "%s %s %s %lld %s",
                     mountlist->el[items].device,
                     mountlist->el[items].mountpoint,
@@ -1060 +1060 @@
     for (i = 0; i < mountlist->entries; i++) {
         fprintf(fout,
-                "%-15s %-15s %-15s %-15lld %-15s %-15s\n",
+                "%-15s %-15s %-15s %-15lld %-15s\n",
                 mountlist->el[i].device, mountlist->el[i].mountpoint,
                 mountlist->el[i].format, mountlist->el[i].size,

branches/2.2.6/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -2311 +2311 @@
     char *ramdisk_fname;
     char *mountlist_file;
-    int res = 0;
-    int fd = 0;
 
     bool try_plan_B;