Changeset 1741 in MondoRescue for branches/2.2.5

Timestamp:

Oct 30, 2007, 11:44:02 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
• tty modes correct to avoid sh error messages
• Use ext3 normally and not ext2 instead
• USB device should be corrected after reading (take 1st part)
• Adds a mount_USB_here function derived from mount_CDROM_here

Location:

branches/2.2.5

Files:

• mindi/deplist.txt (modified) (1 diff)
• mindi/rootfs/sbin/init (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (2 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-newt.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

branches/2.2.5/mindi/deplist.txt

@@ -40 +40 @@
 mount
 devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
+# helps for debugging
+ldd
+
+# For file command
+/usr/share/misc/file/magic /usr/share/file/magic
 
 # For Debug  mode

branches/2.2.5/mindi/rootfs/sbin/init

@@ -282 +282 @@
     /sbin/udevd --daemon
     echo $PKLVL > /proc/sys/kernel/printk
+    # Avoids shell error messages
+    chmod 644 /dev/tty*
 }
 

branches/2.2.5/mondo/src/common/libmondo-devices.c

@@ -1619 +1619 @@
  * @return 0 for success, nonzero for failure.
  */
+int mount_USB_here(char *device, char *mountpoint)
+{
+    /*@ buffer ****************************************************** */
+    char *command;
+    char *dev;
+    int retval;
+
+    malloc_string(command);
+    malloc_string(dev);
+    malloc_string(options);
+    assert_string_is_neither_NULL_nor_zerolength(device);
+    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
+
+    make_hole_for_dir(mountpoint);
+    if (isdigit(device[0])) {
+        return(1);
+    } else {
+        strcpy(dev, device);
+    }
+    log_msg(4, "(mount_USB_here --- device=%s, mountpoint=%s", device,
+            mountpoint);
+
+#ifdef __FreeBSD__
+    sprintf(command, "mount_vfat %s %s 2>> %s",
+            device, mountpoint, MONDO_LOGFILE);
+
+#else
+    sprintf(command, "mount %s -t vfat %s 2>> %s",
+            device, options, mountpoint, MONDO_LOGFILE);
+#endif
+
+    log_msg(4, command);
+    retval = system(command);
+    log_msg(1, "system(%s) returned %d", command, retval);
+
+    paranoid_free(command);
+    paranoid_free(dev);
+    paranoid_free(options);
+    return (retval);
+}
+
+/**
+ * Mount the CD-ROM at @p mountpoint.
+ * @param device The device (or file if g_ISO_restore_mode) to mount.
+ * @param mountpoint The place to mount it.
+ * @return 0 for success, nonzero for failure.
+ */
 int mount_CDROM_here(char *device, char *mountpoint)
 {
@@ -2647 +2694 @@
     }
     if (!is_this_device_mounted(MNT_CDROM)) {
-        mount_CDROM_here(mountdev, MNT_CDROM);
+        if (bkpinfo->backup_media_type == usb) {
+            mount_USB_here(mountdev, MNT_CDROM);
+        } else {
+            mount_CDROM_here(mountdev, MNT_CDROM);
+        }
     }
     cd_number =

branches/2.2.5/mondo/src/mondorestore/mondo-prep.c

@@ -2530 +2530 @@
         strcpy(program, "mkfs.jfs");
     } else if (strcmp(format, "ext3") == 0) {
-        strcpy(program, "mkfs -t ext2 -F -j -q");
+        strcpy(program, "mkfs -t ext3 -F -q");
     } else if (strcmp(format, "minix") == 0) {
         strcpy(program, "mkfs.minix");

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

@@ -253 +253 @@
     strcpy(format_str, "ufs");
 #else
-    strcpy(format_str, "ext2");
+    strcpy(format_str, "ext3");
 #endif
     size_str[0] = '\0';

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

@@ -574 +574 @@
     update_progress_form(tmp);
     strcpy(format, mountlist->el[lino].format);
+    /* BERLIOS: removed as it doen't make sens to not mount ext3 partitions as ext3
     if (!strcmp(format, "ext3")) {
         strcpy(format, "ext2");
     }
+    */
     res = mount_device(mountlist->el[lino].device,
                        mountlist->el[lino].mountpoint,
@@ -692 +694 @@
 #endif
 } else if (bkpinfo->backup_media_type == usb) {
-        sprintf(mount_cmd, "mount -r %s %s", bkpinfo->media_device, MNT_CDROM);
+        sprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
 } else if (strstr(bkpinfo->media_device, "/dev/")) {
 #ifdef __FreeBSD__
@@ -1011 +1013 @@
             fatal_error("Cannot get USB device name from cfg file");
         }
-        strcpy(bkpinfo->media_device, value);
+        sprintf(bkpinfo->media_device, "%s1", value);
         sprintf(tmp, "Backup medium is USB --- dev=%s", bkpinfo->media_device);
         log_msg(2, tmp);