Changeset 3645 in MondoRescue for branches

Timestamp:

Jan 3, 2017, 2:06:25 AM (8 years ago)

Author:

Bruno Cornec

Message:

Minor improvements in msgs

Location:

branches/3.3/mondo/src

Files:

• lib/mr_mem.c (modified) (3 diffs)
• restore-scripts/mondo/mr-grub (modified) (2 diffs)

branches/3.3/mondo/src/lib/mr_mem.c

@@ -36 +36 @@
         *allocated = NULL;
     } else {
-        mr_msg_int(98,line,file,"mr_asprintf","Attempt to free NULL pointer");
+        mr_msg_int(98,line,file,"mr_free_int","Attempt to free NULL pointer");
     }
 }
@@ -47 +47 @@
     ret = malloc(size);
     if (ret == NULL) {
-        mr_msg_int(1,line,file,"mr_asprintf","Unable to alloc memory in mr_malloc\nExiting...");
+        mr_msg_int(1,line,file,"mr_malloc_int","Unable to alloc memory in mr_malloc\nExiting...");
         mr_exit(-1,"Unable to alloc memory in mr_malloc");
     }
@@ -62 +62 @@
     res = vasprintf(strp, fmt, args);
     if (res == -1) {
-        mr_msg_int(1,line,file,"mr_asprintf","Unable to alloc memory in mr_asprintf\nExiting...");
+        mr_msg_int(1,line,file,"mr_asprintf_int","Unable to alloc memory in mr_asprintf\nExiting...");
         mr_exit(-1,"Unable to alloc memory in mr_asprintf");
     }

branches/3.3/mondo/src/restore-scripts/mondo/mr-grub

@@ -14 +14 @@
 
 FindBootPart() {
+    # Work only for grub v1
     local i
     bootpart=""
@@ -175 +176 @@
 echo ".............Cool." 2>&1 | tee -a $LOGFILE
 
-grub=`FindPathOfRESTExe grub`
+grub=`FindPathOfRESTExe grub | head -1`
 mkdir -p /boot
 [ "$MNT_RESTORING" ] && ln -sf /mnt/RESTORING/boot/grub /boot/grub
+[ "$MNT_RESTORING" ] && ln -sf /mnt/RESTORING/boot/grub2 /boot/grub2
 
 # ---------------------------------