Changeset 1375 in MondoRescue
- Timestamp:
- Apr 30, 2007, 11:18:15 AM (18 years ago)
- Location:
- branches/2.2.4/mondo
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.4/mondo/configure.in
r919 r1375 84 84 case "$host_cpu" in 85 85 i?86*) 86 #x86_64*)87 ARCH=i38688 86 CPPFLAGS="$CPPFLAGS -D__IA32__" 89 87 ;; 88 x86_64*) 89 CPPFLAGS="$CPPFLAGS -D__IA32__ -D__X86_64__" 90 ;; 90 91 ia64*) 91 ARCH=ia6492 92 CPPFLAGS="$CPPFLAGS -D__IA64__" 93 93 ;; 94 94 *) 95 echo "*** Sorry, only Intel Architectures (ia32, ia64) are supported at this time. Want to help?"95 echo "*** Sorry, only Intel Architectures (ia32, x86_64, ia64) are supported at this time. Want to help?" 96 96 ;; 97 97 esac 98 AC_SUBST(ARCH)99 98 100 99 LIBS="$LIBS $PTHREAD" -
branches/2.2.4/mondo/src/common/libmondo-tools.c
r1372 r1375 184 184 #include <netinet/in.h> 185 185 #include <arpa/inet.h> 186 #include <sys/utsname.h> 186 187 187 188 /*@unused@*/ … … 358 359 359 360 360 char *get_architecture() 361 { 361 char *get_architecture(void) { 362 362 #ifdef __IA32__ 363 return ("i386"); 363 # ifdef __X86_64__ 364 return ("x86_64"); 365 # else 366 return ("i386"); 367 # endif 364 368 #endif 365 369 #ifdef __IA64__ … … 370 374 371 375 372 373 double get_kernel_version() 376 char *get_uname_m(void) { 377 378 struct utsname utsn; 379 char *tmp = NULL; 380 381 uname(&utsn); 382 mr_asprintf(&tmp, utsn.machine); 383 return (tmp); 384 } 385 386 387 388 double get_kernel_version(void) 374 389 { 375 390 char *p, tmp[200]; -
branches/2.2.4/mondo/src/common/libmondo-tools.h
r128 r1375 49 49 double get_kernel_version(); 50 50 char *get_architecture(); 51 char *get_uname_m(); 51 52 bool does_nonMS_partition_exist(void); 52 53 void stop_magicdev_if_necessary(void); -
branches/2.2.4/mondo/src/mondoarchive/main.c
r1319 r1375 153 153 void welcome_to_mondoarchive(void) 154 154 { 155 char *tmp = NULL; 156 155 157 log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org", 156 158 PACKAGE_VERSION); 157 log_msg(0, "running on %s architecture", get_architecture()); 159 log_msg(0, "running %s binaries", get_architecture()); 160 tmp = get_uname_m(); 161 log_msg(0, "running on %s architecture", tmp); 162 mr_free(tmp); 158 163 log_msg(0, 159 164 "-----------------------------------------------------------");
Note:
See TracChangeset
for help on using the changeset viewer.