Changeset 1377 in MondoRescue for branches/stable/mondo

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

Files:

• configure.in (modified) (1 diff)
• src/common/libmondo-tools.c (modified) (3 diffs)
• src/common/libmondo-tools.h (modified) (1 diff)
• src/mondoarchive/mondoarchive.c (modified) (1 diff)

branches/stable/mondo/configure.in

@@ -85 +85 @@
 case "$host_cpu" in
     i?86*)
-        ARCH=i386
         CPPFLAGS="$CPPFLAGS -D__IA32__ -Wall"
         ;;
     x86_64*)
-        ARCH=x86-64
-        CPPFLAGS="$CPPFLAGS -D__X86_64__ -Wall"
+        CPPFLAGS="$CPPFLAGS -D__IA32__ -D__X86_64__ -Wall"
         ;;
     ia64*)
-        ARCH=ia64
         CPPFLAGS="$CPPFLAGS -D__IA64__ -Wall"
         ;;
     *)
-        echo "*** Sorry, only Intel Architectures (ia32, x86-64, ia64) are supported at this time." 
-        echo "If you Want to help send a mail to bcornec@users.berlios.de" 
+        echo "*** Sorry, only Intel Architectures (ia32, x86_64, ia64) are supported at this time. Want to help?" 
         ;;
 esac
-AC_SUBST(ARCH)
 
 LIBS="$LIBS $PTHREAD"

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);

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -66 +66 @@
 static void welcome_to_mondoarchive(void)
 {
+    char *tmp = NULL;
+
     mr_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org", PACKAGE_VERSION);
-    mr_msg(0, "running on %s architecture", get_architecture());
+    log_msg(0, "running %s binaries", get_architecture());
+    tmp = get_uname_m();
+    log_msg(0, "running on %s architecture", tmp);
+    mr_free(tmp);
     mr_msg(0, "-----------------------------------------------------------");
     mr_msg(0, "NB: Mondo logs almost everything, so don't panic if you see");