[v2] crtools: also print the current kernel version

Submitted by Adrian Reber on Nov. 24, 2017, 1:50 p.m.

Details

Message ID 1511531418-28714-1-git-send-email-adrian@lisas.de
State Accepted
Series "crtools: also print the current kernel version"
Headers show

Commit Message

Adrian Reber Nov. 24, 2017, 1:50 p.m.
From: Adrian Reber <areber@redhat.com>

In addition to writing the CRIU version to the log file this adds the
current kernel version to the log file:

(00.000008) Version: 3.5 (gitid v3.5-511-ga8cc6cf)
(00.000303) Running on node01 Linux 3.10.0-513.el7.x86_64 #1 SMP Tue Feb 29 06:78:90 EST 2017 x86_64

v2:
 - small changes as suggested by Dmitry (thanks)

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/crtools.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

Patch hide | download patch | download mbox

diff --git a/criu/crtools.c b/criu/crtools.c
index 293d631..5f00538 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -21,6 +21,7 @@ 
 
 #include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/utsname.h>
 
 #include "int.h"
 #include "page.h"
@@ -421,6 +422,20 @@  static void init_configuration(int argc, char *argv[], int defaults_forbidden)
 	}
 }
 
+static void print_kernel_version(void)
+{
+	struct utsname buf;
+
+	if (uname(&buf) < 0) {
+		pr_perror("Reading kernel version failed!");
+		/* This pretty unlikely, just keep on running. */
+		return;
+	}
+
+	pr_info("Running on %s %s %s %s %s\n", buf.nodename, buf.sysname,
+		buf.release, buf.version, buf.machine);
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
 #define PARSING_GLOBAL_CONF	1
@@ -967,6 +982,9 @@  int main(int argc, char *argv[], char *envp[])
 	compel_log_init(vprint_on_level, log_get_loglevel());
 
 	pr_info("Version: %s (gitid %s)\n", CRIU_VERSION, CRIU_GITID);
+
+	print_kernel_version();
+
 	if (opts.deprecated_ok)
 		pr_debug("DEPRECATED ON\n");
 

Comments

Dmitry Safonov Nov. 24, 2017, 2:18 p.m.
2017-11-24 13:50 GMT+00:00 Adrian Reber <adrian@lisas.de>:
> From: Adrian Reber <areber@redhat.com>
>
> In addition to writing the CRIU version to the log file this adds the
> current kernel version to the log file:
>
> (00.000008) Version: 3.5 (gitid v3.5-511-ga8cc6cf)
> (00.000303) Running on node01 Linux 3.10.0-513.el7.x86_64 #1 SMP Tue Feb 29 06:78:90 EST 2017 x86_64
>
> v2:
>  - small changes as suggested by Dmitry (thanks)
>
> Signed-off-by: Adrian Reber <areber@redhat.com>

Thanks,
Reviewed-by: Dmitry Safonov <0x7f454c46@gmail.com>
Andrey Vagin Nov. 25, 2017, 6:06 p.m.
Applied, thanks!

On Fri, Nov 24, 2017 at 01:50:18PM +0000, Adrian Reber wrote:
> From: Adrian Reber <areber@redhat.com>
> 
> In addition to writing the CRIU version to the log file this adds the
> current kernel version to the log file:
> 
> (00.000008) Version: 3.5 (gitid v3.5-511-ga8cc6cf)
> (00.000303) Running on node01 Linux 3.10.0-513.el7.x86_64 #1 SMP Tue Feb 29 06:78:90 EST 2017 x86_64
> 
> v2:
>  - small changes as suggested by Dmitry (thanks)
> 
> Signed-off-by: Adrian Reber <areber@redhat.com>
> ---
>  criu/crtools.c | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/criu/crtools.c b/criu/crtools.c
> index 293d631..5f00538 100644
> --- a/criu/crtools.c
> +++ b/criu/crtools.c
> @@ -21,6 +21,7 @@
>  
>  #include <sys/time.h>
>  #include <sys/resource.h>
> +#include <sys/utsname.h>
>  
>  #include "int.h"
>  #include "page.h"
> @@ -421,6 +422,20 @@ static void init_configuration(int argc, char *argv[], int defaults_forbidden)
>  	}
>  }
>  
> +static void print_kernel_version(void)
> +{
> +	struct utsname buf;
> +
> +	if (uname(&buf) < 0) {
> +		pr_perror("Reading kernel version failed!");
> +		/* This pretty unlikely, just keep on running. */
> +		return;
> +	}
> +
> +	pr_info("Running on %s %s %s %s %s\n", buf.nodename, buf.sysname,
> +		buf.release, buf.version, buf.machine);
> +}
> +
>  int main(int argc, char *argv[], char *envp[])
>  {
>  #define PARSING_GLOBAL_CONF	1
> @@ -967,6 +982,9 @@ int main(int argc, char *argv[], char *envp[])
>  	compel_log_init(vprint_on_level, log_get_loglevel());
>  
>  	pr_info("Version: %s (gitid %s)\n", CRIU_VERSION, CRIU_GITID);
> +
> +	print_kernel_version();
> +
>  	if (opts.deprecated_ok)
>  		pr_debug("DEPRECATED ON\n");
>  
> -- 
> 1.8.3.1
>