Changeset 1903 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c

Timestamp:

Apr 10, 2008, 1:13:58 AM (16 years ago)

Author:

Bruno Cornec

Message:

merge -r 1842:1889 2.2.5

File:

• branches/stable/mondo/src/common/libmondo-archive.c (modified) (5 diffs)

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

@@ -42 +42 @@
 #define DVDRWFORMAT 1
 
-#ifndef __FreeBSD__
 #ifndef _SEMUN_H
 #define _SEMUN_H
@@ -56 +55 @@
 };
 #endif
-#endif                          /* __FreeBSD__ */
 
 extern struct mr_ar_conf *mr_conf;
@@ -615 +613 @@
         }
 #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]) {
@@ -3192 +3200 @@
     /*@ bool ******************************************************** */
     bool that_one_was_ok;
-    bool using_nfs;
     bool orig_vfy_flag_val;
 
@@ -3204 +3211 @@
     }
 
-    if (strlen(bkpinfo->nfs_mount) > 1) {
-        using_nfs = TRUE;
-    } else {
-        using_nfs = FALSE;
-    }
     mr_msg(1, "OK, time to make %s #%d",
             bkpinfo->backup_media_string,