Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2022-04-16 00:12:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new.1941 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc"
Sat Apr 16 00:12:45 2022 rev:306 rq:969913 version:8.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2022-03-18
16:41:42.065162636 +0100
+++ /work/SRC/openSUSE:Factory/.linuxrc.new.1941/linuxrc.changes
2022-04-16 00:12:48.081533102 +0200
@@ -1,0 +2,7 @@
+Wed Apr 13 16:13:26 UTC 2022 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc#293
+- do not use zram if there's more than 64 GiB free memory (bsc#1197253)
+- 8.10
+
+--------------------------------------------------------------------
Old:
----
linuxrc-8.9.tar.xz
New:
----
linuxrc-8.10.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.NhWy0X/_old 2022-04-16 00:12:48.721533957 +0200
+++ /var/tmp/diff_new_pack.NhWy0X/_new 2022-04-16 00:12:48.725533962 +0200
@@ -17,7 +17,7 @@
Name: linuxrc
-Version: 8.9
+Version: 8.10
Release: 0
Summary: SUSE Installation Program
License: GPL-3.0+
++++++ linuxrc-8.9.tar.xz -> linuxrc-8.10.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.9/VERSION new/linuxrc-8.10/VERSION
--- old/linuxrc-8.9/VERSION 2022-03-16 14:08:21.000000000 +0100
+++ new/linuxrc-8.10/VERSION 2022-04-13 18:13:26.000000000 +0200
@@ -1 +1 @@
-8.9
+8.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.9/changelog new/linuxrc-8.10/changelog
--- old/linuxrc-8.9/changelog 2022-03-16 14:08:21.000000000 +0100
+++ new/linuxrc-8.10/changelog 2022-04-13 18:13:26.000000000 +0200
@@ -1,3 +1,7 @@
+2022-04-13: 8.10
+ - merge gh#openSUSE/linuxrc#293
+ - do not use zram if there's more than 64 GiB free memory (bsc#1197253)
+
2022-03-16: 8.9
- merge gh#openSUSE/linuxrc#285
- check also raid devices for install repo (bsc#1196061)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.9/linuxrc.c new/linuxrc-8.10/linuxrc.c
--- old/linuxrc-8.9/linuxrc.c 2022-03-16 14:08:21.000000000 +0100
+++ new/linuxrc-8.10/linuxrc.c 2022-04-13 18:13:26.000000000 +0200
@@ -18,6 +18,7 @@
#include <sys/syscall.h>
#include <sys/wait.h>
#include <sys/select.h>
+#include <sys/sysinfo.h>
#include <fcntl.h>
#include <dirent.h>
#include <string.h>
@@ -116,6 +117,8 @@
{
char *prog, *s;
int err, i, j;
+ struct sysinfo si;
+ uint64_t totalram = 0;
prog = (prog = strrchr(*argv, '/')) ? prog + 1 : *argv;
@@ -138,9 +141,13 @@
config.run_as_linuxrc = 1;
config.tmpfs = 1;
- // use zram
- str_copy(&config.zram.root_size, "1G");
- str_copy(&config.zram.swap_size, "1G");
+ if(!sysinfo(&si)) totalram = si.totalram * si.mem_unit;
+
+ // do not use zram if there's more than 64 GiB free memory (bsc#1197253)
+ if(totalram < (64ull << 30)) {
+ str_copy(&config.zram.root_size, "1G");
+ str_copy(&config.zram.swap_size, "1G");
+ }
str_copy(&config.console, "/dev/console");
@@ -162,6 +169,8 @@
config.update.next_name = &config.update.name_list;
+ log_info("totalram: %"PRIu64"\n", totalram);
+
/* maybe we had a segfault recently... */
if(argc == 4 && !strcmp(argv[1], "segv")) {
unsigned state = argv[3][0] - '0';
