Changeset 1771 in MondoRescue for branches/2.2.5

Timestamp:

Nov 6, 2007, 9:13:46 PM (16 years ago)

Author:

Bruno Cornec

Message:

Use RESTORE consistently across mondo to restore without interaction (report from Takeshi Shoji t.shoji_at_tripodw.jp)

Location:

branches/2.2.5

Files:

• mindi/isolinux-H.cfg (modified) (1 diff)
• mindi/mindi-bkphw (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

branches/2.2.5/mindi/isolinux-H.cfg

@@ -5 +5 @@
 label RESTORE
   kernel vmlinuz
-  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=24000 rw root=/dev/ram nuke restore
+  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=24000 rw root=/dev/ram nuke RESTORE
 label expert
   kernel vmlinuz

branches/2.2.5/mindi/mindi-bkphw

@@ -53 +53 @@
         if ($tool =~ /\/conrep$/) {
             $ret = system("(cd $tooldir ; $tool -s -f$bkpdir/conrep.dat)");
-            print SCRIPT "(cd $tooldir ; $tool -s -f$bkpdir/conrep.dat)");
+            print SCRIPT "(cd $tooldir ; $tool -l -f$bkpdir/conrep.dat)");
             print TOOLS "$tool.xml\n";
         }
         if ($tool =~ /\/cpqacuxe$/) {
             $ret = system("$tool -c $bkpdir/cpqacuxe.dat");
-            print SCRIPT "$tool -r $bkpdir/cpqacuxe.dat");
+            print SCRIPT "$tool -i $bkpdir/cpqacuxe.dat)");
             print TOOLS "$tooldir/bld\n";
         }

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

@@ -525 +525 @@
 /**************************************************************************
 *END_KILL_PETRIS                                                         *
+**************************************************************************/
+
+
+/**
+* Mount @p device at @p mpt as @p format.
+* @param device The device (/dev entry) to mount.
+* @param mpt The directory to mount it on.
+* @param format The filesystem type of @p device.
+* @param writeable If TRUE, mount read-write; if FALSE, mount read-only.
+* @return 0 for success, nonzero for failure.
+*/
+int mount_device(char *device, char *mpt, char *format, bool writeable)
+{
+int res = 0;
+
+/** malloc **/
+char *tmp, *command, *mountdir, *mountpoint, *additional_parameters;
+
+assert_string_is_neither_NULL_nor_zerolength(device);
+assert_string_is_neither_NULL_nor_zerolength(mpt);
+assert(format != NULL);
+malloc_string(tmp);
+malloc_string(command);
+malloc_string(mountdir);
+malloc_string(mountpoint);
+malloc_string(additional_parameters);
+
+if (!strcmp(mpt, "/1")) {
+    strcpy(mountpoint, "/");
+    log_msg(3, "Mommm! SME is being a dildo!");
+} else {
+    strcpy(mountpoint, mpt);
+}
+
+if (!strcmp(mountpoint, "lvm")) {
+    return (0);
+}
+if (!strcmp(mountpoint, "image")) {
+    return (0);
+}
+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");
+}
+
+if (!strcmp(mountpoint, "swap")) {
+    sprintf(command, "swapon %s", device);
+} else {
+if (!strcmp(mountpoint, "/")) {
+    strcpy(mountdir, MNT_RESTORING);
+} else {
+    sprintf(mountdir, "%s%s", MNT_RESTORING, mountpoint);
+}
+sprintf(command, "mkdir -p %s", mountdir);
+run_program_and_log_output(command, FALSE);
+sprintf(command, "mount -t %s %s %s %s 2>> %s", format, device,
+        additional_parameters, mountdir, MONDO_LOGFILE);
+log_msg(2, "command='%s'", command);
+}
+res = run_program_and_log_output(command, TRUE);
+if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
+    log_msg(1, "Re-trying without the fancy extra parameters");
+    sprintf(command, "mount -t %s %s %s 2>> %s", format, device,
+        mountdir, MONDO_LOGFILE);
+    res = run_program_and_log_output(command, TRUE);
+}
+if (res) {
+    log_msg(1, "Unable to mount device %s (type %s) at %s", device,
+        format, mountdir);
+    log_msg(1, "command was '%s'", command);
+    if (!strcmp(mountpoint, "swap")) {
+        log_to_screen(tmp);
+    } else {
+        log_msg(2, "Retrying w/o the '-t' switch");
+        sprintf(command, "mount %s %s 2>> %s", device, mountdir,
+            MONDO_LOGFILE);
+        log_msg(2, "2nd command = '%s'", command);
+        res = run_program_and_log_output(command, TRUE);
+        if (res == 0) {
+            log_msg(1,
+                "That's OK. I called mount w/o a filesystem type and it worked fine in the end.");
+        } else {
+            log_to_screen(tmp);
+        }
+    }
+}
+if (res && !strcmp(mountpoint, "swap")) {
+    log_msg(2, "That's ok. It's just a swap partition.");
+    log_msg(2, "Non-fatal error. Returning 0.");
+    res = 0;
+}
+
+paranoid_free(tmp);
+paranoid_free(command);
+paranoid_free(mountdir);
+paranoid_free(mountpoint);
+paranoid_free(additional_parameters);
+
+return (res);
+}
+
+/**************************************************************************
+*END_MOUNT_DEVICE                                                        *
 **************************************************************************/
 
@@ -747 +859 @@
 /**************************************************************************
 *END_MOUNT_CDROM                                                         *
-**************************************************************************/
-
-
-/**
-* Mount @p device at @p mpt as @p format.
-* @param device The device (/dev entry) to mount.
-* @param mpt The directory to mount it on.
-* @param format The filesystem type of @p device.
-* @param writeable If TRUE, mount read-write; if FALSE, mount read-only.
-* @return 0 for success, nonzero for failure.
-*/
-int mount_device(char *device, char *mpt, char *format, bool writeable)
-{
-int res = 0;
-
-/** malloc **/
-char *tmp, *command, *mountdir, *mountpoint, *additional_parameters;
-
-assert_string_is_neither_NULL_nor_zerolength(device);
-assert_string_is_neither_NULL_nor_zerolength(mpt);
-assert(format != NULL);
-malloc_string(tmp);
-malloc_string(command);
-malloc_string(mountdir);
-malloc_string(mountpoint);
-malloc_string(additional_parameters);
-
-if (!strcmp(mpt, "/1")) {
-    strcpy(mountpoint, "/");
-    log_msg(3, "Mommm! SME is being a dildo!");
-} else {
-    strcpy(mountpoint, mpt);
-}
-
-if (!strcmp(mountpoint, "lvm")) {
-    return (0);
-}
-if (!strcmp(mountpoint, "image")) {
-    return (0);
-}
-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");
-}
-
-if (!strcmp(mountpoint, "swap")) {
-    sprintf(command, "swapon %s", device);
-} else {
-if (!strcmp(mountpoint, "/")) {
-    strcpy(mountdir, MNT_RESTORING);
-} else {
-    sprintf(mountdir, "%s%s", MNT_RESTORING, mountpoint);
-}
-sprintf(command, "mkdir -p %s", mountdir);
-run_program_and_log_output(command, FALSE);
-sprintf(command, "mount -t %s %s %s %s 2>> %s", format, device,
-        additional_parameters, mountdir, MONDO_LOGFILE);
-log_msg(2, "command='%s'", command);
-}
-res = run_program_and_log_output(command, TRUE);
-if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
-    log_msg(1, "Re-trying without the fancy extra parameters");
-    sprintf(command, "mount -t %s %s %s 2>> %s", format, device,
-        mountdir, MONDO_LOGFILE);
-    res = run_program_and_log_output(command, TRUE);
-}
-if (res) {
-    log_msg(1, "Unable to mount device %s (type %s) at %s", device,
-        format, mountdir);
-    log_msg(1, "command was '%s'", command);
-    if (!strcmp(mountpoint, "swap")) {
-        log_to_screen(tmp);
-    } else {
-        log_msg(2, "Retrying w/o the '-t' switch");
-        sprintf(command, "mount %s %s 2>> %s", device, mountdir,
-            MONDO_LOGFILE);
-        log_msg(2, "2nd command = '%s'", command);
-        res = run_program_and_log_output(command, TRUE);
-        if (res == 0) {
-            log_msg(1,
-                "That's OK. I called mount w/o a filesystem type and it worked fine in the end.");
-        } else {
-            log_to_screen(tmp);
-        }
-    }
-}
-if (res && !strcmp(mountpoint, "swap")) {
-    log_msg(2, "That's ok. It's just a swap partition.");
-    log_msg(2, "Non-fatal error. Returning 0.");
-    res = 0;
-}
-
-paranoid_free(tmp);
-paranoid_free(command);
-paranoid_free(mountdir);
-paranoid_free(mountpoint);
-paranoid_free(additional_parameters);
-
-return (res);
-}
-
-/**************************************************************************
-*END_MOUNT_DEVICE                                                        *
 **************************************************************************/