diff --git a/Makefile b/Makefile index 030006534..4fb56b87e 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,7 @@ build: dependencies CFLAGS=-I$(PREFIX)/usr/include/ \ LDFLAGS=-Wl,-L$(PREFIX)/usr/lib/ \ NLDIR=$(PREFIX)/usr/include/libnl3/ \ + PCIDIR=$(PREFIX)/usr/include \ make -C server # Test S2SS server by running it for 3 secs diff --git a/server/include/config.h b/server/include/config.h index aaaecad51..7cc6031fc 100644 --- a/server/include/config.h +++ b/server/include/config.h @@ -27,7 +27,7 @@ #define DEFAULT_POOLSIZE 32 /** Width of log output in characters */ -#define LOG_WIDTH 100 +#define LOG_WIDTH 74 /** Socket priority */ #define SOCKET_PRIO 7 @@ -40,6 +40,9 @@ #define KERNEL_VERSION_MAJ 3 #define KERNEL_VERSION_MIN 4 +#ifndef LICENSE_VALID + #define LICENSE_VALID 0 +#endif #define LICENSE_CHECKS \ { { "/sys/class/dmi/id/product_uuid", "5002E503-4904-EB05-7406-0C0700080009" }, \ { "/sys/class/net/eth0/address" , "50:e5:49:eb:74:0c" }, \ diff --git a/server/include/utils.h b/server/include/utils.h index 7298cbf84..461a49bb6 100644 --- a/server/include/utils.h +++ b/server/include/utils.h @@ -38,11 +38,6 @@ #define ACS_VERTICAL ACS("\x78") #define ACS_VERTRIGHT ACS("\x74") -/* UTF-8 Line drawing characters */ -#define UTF8_BOX "\xE2\x96\x88" -#define UTF8_VERTICAL "\xE2\x94\x82" -#define UTF8_VERTRIGHT "\xE2\x94\x9C" - /* CPP stringification */ #define XSTR(x) STR(x) #define STR(x) #x diff --git a/server/src/server.c b/server/src/server.c index 3ab5aa0ab..34897c18c 100644 --- a/server/src/server.c +++ b/server/src/server.c @@ -138,8 +138,9 @@ int main(int argc, char *argv[]) char *configfile = (argc == 2) ? argv[1] : "opal-shmem.conf"; log_reset(); - info("This is Simulator2Simulator Server (S2SS) %s (built on %s, %s)", - BLD(YEL(VERSION)), BLD(MAG(__DATE__)), BLD(MAG(__TIME__))); + info("This is Simulator2Simulator Server (S2SS)"); + info (" Version: %s (built on %s, %s)", BLD(YEL(VERSION)), + BLD(MAG(__DATE__)), BLD(MAG(__TIME__))); /* Checks system requirements*/ if (check_root())