Changeset 1377 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

Apr 30, 2007, 11:25:39 AM (17 years ago)

Author:

Bruno Cornec

Message:

• ARCH removed from configure.in as useless
• addition of get_uname_m (to give the underlying arch)
• get_architecture now returns correctly the built arch used (including x86_64)
• IA32 is defined for both i386 and x86_64. An additional vdefine X86_64 is also setup for tha later arch.

Location:

branches/stable/mondo/src/common

Files:

• libmondo-tools.c (modified) (3 diffs)
• libmondo-tools.h (modified) (1 diff)

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

@@ -23 +23 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <sys/utsname.h>
 
 /*@unused@*/
@@ -192 +193 @@
 
 
-char *get_architecture(void)
-{
+char *get_architecture(void) {
 #ifdef __IA32__
-    return ("i386");
+#   ifdef __X86_64__
+        return ("x86_64");
+#   else
+        return ("i386");
+#   endif
 #endif
 #ifdef __X86_64__
@@ -205 +209 @@
     return ("unknown");
 }
+
+
+char *get_uname_m(void) {
+
+    struct utsname utsn;
+    char *tmp = NULL;
+
+    uname(&utsn);
+    mr_asprintf(&tmp, utsn.machine);
+    return (tmp);
+}
+
 
 

branches/stable/mondo/src/common/libmondo-tools.h

@@ -45 +45 @@
 double get_kernel_version(void);
 char *get_architecture(void);
+char *get_uname_m();
 bool does_nonMS_partition_exist(void);
 void stop_magicdev_if_necessary(void);