Changeset 3147 in MondoRescue for branches/3.1/mondo/src/mondoarchive

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

Location:

branches/3.1/mondo/src/mondoarchive

Files:

• mondoarchive.c (modified) (5 diffs)
• mondoarchive.h (modified) (1 diff)

branches/3.1/mondo/src/mondoarchive/mondoarchive.c

@@ -47 +47 @@
  */
 bool g_ISO_restore_mode = FALSE;
+
+/* Whether we should fail immediately at first error */
+bool g_fail_immediately = FALSE;
 
 /* Do we use extended attributes and acl ?
@@ -159 +162 @@
     int retval = 0;
     char *say_at_end = NULL;
+    FILE *fin = NULL;
 
     printf("Initializing...\n");
@@ -260 +264 @@
         g_loglevel = 10;
         finish(set_acl_list(argv[2], argv[3]));
+    }
+    if (argc >= 2 && !strcmp(argv[1], "mkraidtab")) {
+        g_loglevel = 10;
+        g_text_mode = TRUE;
+        setup_newt_stuff();
+#undef MDSTAT_FILE
+#define MDSTAT_FILE "/tmp/mdstat"
+        if (!(fin = fopen(MDSTAT_FILE, "r"))) {
+            log_msg(1, "Could not open %s.\n", MDSTAT_FILE);
+                finish(1);
+        }
+
+        create_raidtab_from_mdstat(MDSTAT_FILE,"/tmp/raidtab");
+        finish(0);
     }
 
@@ -397 +415 @@
     run_program_and_log_output("mount", 2);
 
-    system("rm -f "MONDO_CACHE"/last-backup.aborted");
+    paranoid_system("rm -f "MONDO_CACHE"/last-backup.aborted");
     if (!retval) {
         printf("Mondoarchive ran OK.\n");
@@ -421 +439 @@
     mr_free(tmp);
 
-    chdir("/tmp");
+    if (chdir("/tmp")) {
+        // FIXME
+    }
 
     if (!g_text_mode) {

branches/3.1/mondo/src/mondoarchive/mondoarchive.h

@@ -9 +9 @@
  */
 char *MONDO_LOGFILE = "/var/log/mondoarchive.log";
-char *MONDO_OPTIONS = "0123456789A:B:C:DE:GHI:J:K:LNOP:QRS:T:UVWYb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
+char *MONDO_OPTIONS = "0123456789A:B:C:DE:FGHI:J:K:LM:NOP:QRS:T:UVWYb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
 
 /* No restriction on ps options */