Changeset 1937 in MondoRescue for branches/2.2.6

Timestamp:

May 15, 2008, 1:58:56 PM (16 years ago)

Author:

Bruno Cornec

Message:

Attempt to fix problem with SuSE 10.2 boot loader not reinstalled - may also fix other SLES issues reported with the same problem - by mounting /proc and /sys in the chroot during mount_all_devices

File:

• branches/2.2.6/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

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

@@ -563 +563 @@
     sprintf(tmp, "Mounting device %s   ", device);
     log_msg(1, tmp);
-    if (writeable) {
-        strcpy(additional_parameters, "-o rw");
-    } else {
-        strcpy(additional_parameters, "-o ro");
-    }
-    if (find_home_of_exe("setfattr")) {
-        strcat(additional_parameters, ",user_xattr");
-    }
-    if (find_home_of_exe("setfacl")) {
-        strcat(additional_parameters, ",acl");
+    /* Deal with additional params only if not /proc or /sys */
+    if (strcmp(format, "proc") && strcmp(format, "sys")) {
+        if (writeable) {
+            strcpy(additional_parameters, "-o rw");
+        } else {
+            strcpy(additional_parameters, "-o ro");
+        }
+        if (find_home_of_exe("setfattr")) {
+            strcat(additional_parameters, ",user_xattr");
+        }
+        if (find_home_of_exe("setfacl")) {
+            strcat(additional_parameters, ",acl");
+        }
     }
 
@@ -727 +730 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
+    /* Also mounting under MNT_RESTORING  special FS */
+    (void)mount_device("/proc","/proc","proc",TRUE);
+    (void)mount_device("/sys","/sys","sysfs",TRUE);
     run_program_and_log_output("df -m", 3);
     paranoid_free(mountlist);