Fix autoinstall logic when configured memory is lower than needed

invirt-database: Fix the autoinstall logic so that if we've
increased the memory temporarily for the autoinstall above
the machine's database setting, we also bring maxmem up to
the same level.  Otherwise the machine doesn't turn on
because it's requesting to start with more memory than maxmem,
and this failure mode is silent to the user.

diff --git a/debian/changelog b/debian/changelog
index 40ff336..c0ac0ae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+invirt-xen-config (0.0.57) unstable; urgency=low
+
+  * invirt-database: Fix the autoinstall logic so that if we've
+    increased the memory temporarily for the autoinstall above
+    the machine's database setting, we also bring maxmem up to
+    the same level.  Otherwise the machine doesn't turn on
+    because it's requesting to start with more memory than maxmem,
+    and this failure mode is silent to the user.
+
+ -- Mitchell Berger <mitchb@mit.edu>  Sat, 02 Feb 2019 16:52:00 -0500
+

 invirt-xen-config (0.0.56) unstable; urgency=low
 
   * vif-invirtroute: Kill arpspoof with SIGKILL when we're done.  The
 invirt-xen-config (0.0.56) unstable; urgency=low
 
   * vif-invirtroute: Kill arpspoof with SIGKILL when we're done.  The

diff --git a/invirt-database b/invirt-database
index 5e7b772..11fefb5 100644 (file)
--- a/invirt-database
+++ b/invirt-database
@@ -101,6 +101,7 @@ if 'installer_options' in locals(): #Installer
     codepath = None
 
     memory = max(memory, 768)
     codepath = None
 
     memory = max(memory, 768)

+    maxmem = memory

 elif cdrom is not None:
     disk.append('phy:/dev/xenvg/image_' + cdrom.cdrom_id + ',hdc:cdrom,r')
     boot = 'd'
 elif cdrom is not None:
     disk.append('phy:/dev/xenvg/image_' + cdrom.cdrom_id + ',hdc:cdrom,r')
     boot = 'd'