Changeset 2144 in MondoRescue

Timestamp:

Feb 14, 2009, 2:10:28 AM (16 years ago)

Author:

Bruno Cornec

Message:

Ok, really fix the Ubuntu problem as we need first to umount /var and then create the dirs

Location:

branches/2.2.9/mondo/src/mondorestore

Files:

• mondo-rstr-tools.c (modified) (2 diffs)
• mondorestore.c (modified) (1 diff)

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

@@ -721 +721 @@
 run_program_and_log_output("mkdir -p " MNT_RESTORING
                        "/var/run/console", FALSE);
-/* To support latest Ubuntu where /var is a separate FS Cf: http://linux.derkeiler.com/Mailing-Lists/Ubuntu/2007-04/msg01319.html */
-run_program_and_log_output("mkdir -p " MNT_RESTORING
-                       "/var/lock", FALSE);
-run_program_and_log_output("mkdir -p " MNT_RESTORING
-                       "/var/run", FALSE);
 run_program_and_log_output("chmod 777 " MNT_RESTORING "/dev/null",
                        FALSE);
@@ -2091 +2086 @@
                     sprintf(command, "umount " MNT_RESTORING "%s",
                             mountlist->el[lino].mountpoint);
+
+                    /* To support latest Ubuntu where /var is a separate FS 
+                     * Cf: http://linux.derkeiler.com/Mailing-Lists/Ubuntu/2007-04/msg01319.html 
+                     * we need to create some dirs under the real / before unmounting it */
+                    if (!strcmp(mountlist->el[lino].mountpoint, "/")) {
+                        run_program_and_log_output("mkdir -p " MNT_RESTORING "/var/lock", FALSE);
+                        run_program_and_log_output("mkdir -p " MNT_RESTORING "/var/run", FALSE);
+                    }
                 }
             }

branches/2.2.9/mondo/src/mondorestore/mondorestore.c

@@ -655 +655 @@
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);
+
     /*  if (restore_some || restore_all || */
     if (ask_me_yes_or_no