Changeset 2030 in MondoRescue for branches/2.2.7/mondo/src/common/libmondo-tools.c

Timestamp:

Oct 3, 2008, 1:50:44 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix #252
• Improve OCFS2 support (ocfs2 is a SANE_FORMAT)

File:

• branches/2.2.7/mondo/src/common/libmondo-tools.c (modified) (10 diffs)

branches/2.2.7/mondo/src/common/libmondo-tools.c

@@ -1 @@
-/* libmondo-tools.c                                  misc tools
+/*
    $Id$
 */
@@ -64 +64 @@
 /**
  * The location where tmpfs is mounted, or "" if it's not mounted.
- */
 char *g_tmpfs_mountpt = NULL;
+ */
 char *g_magicdev_command = NULL;
 
@@ -426 +426 @@
     char *hostname, *ip_address;
     int retval = 0;
-    long avm = 0;
     char *colon;
     char *cdr_exe;
     char *tmp;
     char call_before_iso_user[MAX_STR_LEN] = "\0";
+    /*
+    long avm = 0;
     int rdsiz_MB;
+    */
     char *iso_dev;
     char *iso_mnt;
@@ -471 +473 @@
     run_program_and_log_output("cat /etc/*-release", 5);
     run_program_and_log_output("cat /etc/*issue*", 5);
+    /*
     sprintf(g_tmpfs_mountpt, "%s/tmpfs", bkpinfo->tmpdir);
     sprintf(command, "mkdir -p %s", g_tmpfs_mountpt);
     paranoid_system(command);
     rdsiz_MB = PPCFG_RAMDISK_SIZE + g_tape_buffer_size_MB;
+    */
 #ifdef __FreeBSD__
+    /*
     strcpy(tmp,
            call_program_and_get_last_line_of_output
@@ -486 +491 @@
     sprintf(command, "mdmfs -s %d%c md9 %s", rdsiz_MB, 'm',
             g_tmpfs_mountpt);
+            */
 #else
+    /*
     strcpy(tmp,
            call_program_and_get_last_line_of_output
@@ -493 +500 @@
     sprintf(command, "mount /dev/shm -t tmpfs %s -o size=%d%c",
             g_tmpfs_mountpt, rdsiz_MB, 'm');
+            */
     run_program_and_log_output("cat /proc/cpuinfo", 5);
     run_program_and_log_output
@@ -498 +506 @@
          5);
 #endif
+    /*
     if (avm / 1024 > rdsiz_MB * 3) {
         if (run_program_and_log_output(command, 5)) {
@@ -509 +518 @@
         log_it("It doesn't seem you have enough swap to use tmpfs. Fine.");
     }
+    */
 
     if (bkpinfo->use_lzo) {
@@ -1429 +1439 @@
         malloc_string(g_boot_mountpt);
         malloc_string(g_mondo_home);
+        /*
         malloc_string(g_tmpfs_mountpt);
+        */
         malloc_string(g_serial_string);
         malloc_string(g_magicdev_command);
@@ -1435 +1447 @@
         paranoid_free(g_boot_mountpt);
         paranoid_free(g_mondo_home);
+        /*
         paranoid_free(g_tmpfs_mountpt);
+        */
         paranoid_free(g_serial_string);
         paranoid_free(g_magicdev_command);