Changeset 2329 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

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.

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

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 */