Less strict low memory detection (bsc#1045915)

There might be some rounding in the hwinfo memory size detection - 3.3.0
yast · Jul 20, 2017 · d08743c · d08743c
1 parent 2bb6dcd
commit d08743c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul 20 06:44:42 UTC 2017 - lslezak@suse.cz
+
+- Less strict low memory detection, there might be some rounding
+  in the hwinfo memory size detection (bsc#1045915)
+- 3.3.0
+
 -------------------------------------------------------------------
 Tue Jul 11 14:41:58 UTC 2017 - lslezak@suse.cz
 

diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        3.2.24
+Version:        3.3.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/clients/inst_productsources.rb b/src/clients/inst_productsources.rb
@@ -1736,8 +1736,9 @@ def RunMain
     # display a warning when online repositories are used on a system
     # with low memory (the installer may crash or freeze, see bnc#854755)
     def check_memory_size
-      # less than LOW_MEMORY_MIB RAM
-      if Mode.installation && Yast2::HwDetection.memory < (LOW_MEMORY_MIB << 20)
+      # less than LOW_MEMORY_MIB RAM, the 64MiB buffer is for possible
+      # rounding in hwinfo memory detection (bsc#1045915)
+      if Mode.installation && Yast2::HwDetection.memory < ((LOW_MEMORY_MIB - 64) << 20)
         Report.Warning(_("Low memory detected.\n\nUsing online repositories " +
               "during initial installation with less than\n" +
               "%dMiB system memory is not recommended.\n\n" +