Changeset 1878 in MondoRescue

Timestamp:

Jan 24, 2008, 6:04:44 PM (17 years ago)

Author:

Bruno Cornec

Message:

fix an issue in the kill procedure

Location:

branches/2.2.5/mondo/src/common

Files:

• libmondo-archive.c (modified) (1 diff)
• newt-specific.c (modified) (1 diff)

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

@@ -817 +817 @@
         }
 #else
+#ifdef __IA64__
+        strcpy(bootdev, call_program_and_get_last_line_of_output
+               ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+#else
         strcpy(bootdev, call_program_and_get_last_line_of_output
                ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+#endif
         if (strstr(bootdev, "/dev/cciss/")) {
+#ifdef __IA64__
+            strcpy(bootdev, call_program_and_get_last_line_of_output
+                   ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+#else
             strcpy(bootdev, call_program_and_get_last_line_of_output
                    ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+#endif
         }
         if (!bootdev[0]) {

branches/2.2.5/mondo/src/common/newt-specific.c

@@ -355 +355 @@
     run_program_and_log_output(tmp, TRUE);
     if (strlen(tmp) > 0) {
-        asprintf(&tmp1,"kill %s", tmp);
+        asprintf(&tmp1,"kill `%s`", tmp);
         run_program_and_log_output(tmp1, TRUE);
         paranoid_free(tmp1);