Changeset 2329 in MondoRescue for branches/2.2.10/mondo

Timestamp:

Aug 18, 2009, 3:20:46 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3340@localhost: bruno | 2009-08-12 00:17:29 +0200
Improve portability by defining all cmdline usage in 1 include (/tmp for FreeBSD and /proc fior LInux). Also doing tht for scripts.

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (1 diff)
• include/my-stuff.h (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (3 diffs)
• mondorestore/mondorestore.c (modified) (5 diffs)

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

@@ -732 +732 @@
 
     if (found_it) {
-        mr_asprintf(tmp1, "grep \"%s=ide-scsi\" /proc/cmdline &> /dev/null", strrchr(output, '/') + 1);
+        mr_asprintf(tmp1, "grep \"%s=ide-scsi\" " CMDLINE " &> /dev/null", strrchr(output, '/') + 1);
         if (system(tmp1) == 0) {
             log_msg(4, "%s is not right. It's being SCSI-emulated. Continuing.", output);

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

@@ -745 +745 @@
     }
     g_current_media_number = 1;
-    bkpinfo->postnuke_tarball[0] = '\0';
     return (res);
 }

branches/2.2.10/mondo/src/include/my-stuff.h

@@ -93 +93 @@
  */
 #define MONDO_TRACEFILE "/var/log/mondo-tracefile.log"
+
+#ifdef __FreeBSD__
+#define CMDLINE "/tmp/cmdline"
+#else
+// Default Linux
+#define CMDLINE "/proc/cmdline"
+#endif
 
 #undef assert

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

@@ -784 +784 @@
         }
     
-        if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) {
+        if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "pxe")) {
             /* We need to override prefix value in PXE mode as it's 
             * already done in start-nfs */
@@ -948 +948 @@
 
 tmp = read_cfg_var(g_mondo_cfg_file, "please-dont-eject");
-if (tmp || strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "donteject")) {
+if (tmp || strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "donteject")) {
     bkpinfo->please_dont_eject = TRUE;
     log_msg(2, "Ok, I shan't eject when restoring! Groovy.");
@@ -977 +977 @@
         }
     }
-    if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) {
+    if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "pxe")) {
         /* We need to override values in PXE mode as it's
         * already done in start-nfs */

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -471 +471 @@
     log_it("Done loading config file; resizing ML");
 
-#ifdef __FreeBSD__
-    if (strstr(call_program_and_get_last_line_of_output("cat /tmp/cmdline"), "noresize"))
-#else
-    if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "noresize"))
-#endif
-    {
+    if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "noresize")) {
         log_msg(1, "Not resizing mountlist.");
     } else {
@@ -773 +768 @@
     get_cfg_file_from_archive_or_bust();
     load_mountlist(mountlist, g_mountlist_fname);   // in case read_cfg_file_into_bkpinfo updated the mountlist
-#ifdef __FreeBSD__
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /tmp/cmdline"),
-         "noresize"))
-#else
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
-         "noresize"))
-#endif
-    {
+    if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "noresize")) {
         log_msg(2, "Not resizing mountlist.");
     } else {
@@ -811 +797 @@
             twenty_seconds_til_yikes();
             g_fprep = fopen("/tmp/prep.sh", "w");
-#ifdef __FreeBSD__
-            if (strstr
-                (call_program_and_get_last_line_of_output
-                 ("cat /tmp/cmdline"), "nopart"))
-#else
-            if (strstr
-                (call_program_and_get_last_line_of_output
-                 ("cat /proc/cmdline"), "nopart"))
-#endif
-            {
+            if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "nopart")) {
                 log_msg(2,
                         "Not partitioning drives due to 'nopart' option.");
@@ -894 +871 @@
     if (retval) {
         log_to_screen("Errors occurred during the nuke phase.");
-    } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE")) {
+    } else if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "RESTORE")) {
         log_to_screen
             ("PC was restored successfully. Thank you for using Mondo Rescue.");
@@ -2667 +2644 @@
     /* Configure global variables */
     malloc_libmondo_global_strings();
-#ifdef __FreeBSD__
-    if (strstr(call_program_and_get_last_line_of_output("cat /tmp/cmdline"), "textonly"))
-#else
-    if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "textonly"))
-#endif
+    if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "textonly"))
     {
         g_text_mode = TRUE;