Description for adjust_by_ram

products.d/tumbleweed.yaml

@@ -154,10 +154,12 @@ storage:
     - mount_path: "swap"
       filesystem: swap
       size:
-        auto: false
-        min: 1 GiB
-        max: 2 GiB
+        auto: true
       outline:
+        auto_size:
+          base_min: 1 GiB
+          base_max: 2 GiB
+          adjust_by_ram: true
         required: false
         filesystems:
           - swap

service/.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
   Exclude:
     - vendor/**/*
     - lib/agama/dbus/y2dir/**/*
-    - agama.gemspec
+    - agama-yast.gemspec
     - package/*.spec
 
 # a D-Bus method definition may take up more line lenght than usual

service/lib/agama/dbus/storage/volume_conversion/to_dbus.rb

@@ -70,6 +70,7 @@ def outline_conversion(target)
               "Required"              => outline.required?,
               "FsTypes"               => outline.filesystems.map(&:to_human_string),
               "SupportAutoSize"       => outline.adaptive_sizes?,
+              "AdjustByRam"           => outline.adjust_by_ram?,
               "SnapshotsConfigurable" => outline.snapshots_configurable?,
               "SnapshotsAffectSizes"  => outline.snapshots_affect_sizes?,
               "SizeRelevantVolumes"   => outline.size_relevant_volumes

service/test/agama/dbus/storage/proposal_settings_conversion/to_dbus_test.rb

@@ -92,6 +92,7 @@
               "SupportAutoSize"       => false,
               "SnapshotsConfigurable" => false,
               "SnapshotsAffectSizes"  => false,
+              "AdjustByRam"           => false,
               "SizeRelevantVolumes"   => []
             }
           }

service/test/agama/dbus/storage/volume_conversion/to_dbus_test.rb

@@ -38,6 +38,7 @@
       outline.snapshots_configurable = true
       outline.snapshots_size = Y2Storage::DiskSize.new(1000)
       outline.snapshots_percentage = 10
+      outline.adjust_by_ram = true
     end
 
     Agama::Storage::Volume.new("/test").tap do |volume|
@@ -70,6 +71,7 @@
           "Required"              => false,
           "FsTypes"               => [],
           "SupportAutoSize"       => false,
+          "AdjustByRam"           => false,
           "SnapshotsConfigurable" => false,
           "SnapshotsAffectSizes"  => false,
           "SizeRelevantVolumes"   => []
@@ -90,6 +92,7 @@
         "Outline"       => {
           "Required"              => true,
           "FsTypes"               => ["Ext3", "Ext4"],
+          "AdjustByRam"           => true,
           "SupportAutoSize"       => true,
           "SnapshotsConfigurable" => true,
           "SnapshotsAffectSizes"  => true,

web/src/client/storage.js

@@ -300,6 +300,7 @@ class ProposalManager {
    * @property {boolean} required
    * @property {string[]} fsTypes
    * @property {boolean} supportAutoSize
+   * @property {boolean} adjustByRam
    * @property {boolean} snapshotsConfigurable
    * @property {boolean} snapshotsAffectSizes
    * @property {string[]} sizeRelevantVolumes
@@ -543,6 +544,7 @@ class ProposalManager {
         required: dbusOutline.Required.v,
         fsTypes: dbusOutline.FsTypes.v.map(val => val.v),
         supportAutoSize: dbusOutline.SupportAutoSize.v,
+        adjustByRam: dbusOutline.AdjustByRam.v,
         snapshotsConfigurable: dbusOutline.SnapshotsConfigurable.v,
         snapshotsAffectSizes: dbusOutline.SnapshotsAffectSizes.v,
         sizeRelevantVolumes: dbusOutline.SizeRelevantVolumes.v.map(val => val.v)

web/src/client/storage.test.js

@@ -329,6 +329,7 @@ const contexts = {
               SupportAutoSize: { t: "b", v: true },
               SnapshotsConfigurable: { t: "b", v: true },
               SnapshotsAffectSizes: { t: "b", v: true },
+              AdjustByRam: { t: "b", v: false },
               SizeRelevantVolumes: { t: "as", v: [{ t: "s", v: "/home" }] }
             }
           }
@@ -349,6 +350,7 @@ const contexts = {
               SupportAutoSize: { t: "b", v: false },
               SnapshotsConfigurable: { t: "b", v: false },
               SnapshotsAffectSizes: { t: "b", v: false },
+              AdjustByRam: { t: "b", v: false },
               SizeRelevantVolumes: { t: "as", v: [] }
             }
           }
@@ -1017,6 +1019,7 @@ describe("#proposal", () => {
                 SupportAutoSize: { t: "b", v: false },
                 SnapshotsConfigurable: { t: "b", v: false },
                 SnapshotsAffectSizes: { t: "b", v: false },
+                AdjustByRam: { t: "b", v: false },
                 SizeRelevantVolumes: { t: "as", v: [] }
               }
             }
@@ -1037,6 +1040,7 @@ describe("#proposal", () => {
                 SupportAutoSize: { t: "b", v: false },
                 SnapshotsConfigurable: { t: "b", v: false },
                 SnapshotsAffectSizes: { t: "b", v: false },
+                AdjustByRam: { t: "b", v: false },
                 SizeRelevantVolumes: { t: "as", v: [] }
               }
             }
@@ -1064,6 +1068,7 @@ describe("#proposal", () => {
           supportAutoSize: false,
           snapshotsConfigurable: false,
           snapshotsAffectSizes: false,
+          adjustByRam: false,
           sizeRelevantVolumes: []
         }
       });
@@ -1084,6 +1089,7 @@ describe("#proposal", () => {
           supportAutoSize: false,
           snapshotsConfigurable: false,
           snapshotsAffectSizes: false,
+          adjustByRam: false,
           sizeRelevantVolumes: []
         }
       });

web/src/components/storage/ProposalVolumes.jsx

@@ -46,16 +46,16 @@ import { noop } from "~/utils";
  * @returns {(ReactComponent|null)} component to display (can be `null`)
  */
 const AutoCalculatedHint = (volume) => {
-  // no hint, the size is not affected by snapshots or other volumes
-  const { snapshotsAffectSizes = false, sizeRelevantVolumes = [] } = volume.outline;
+  const { snapshotsAffectSizes = false, sizeRelevantVolumes = [], adjustByRam } = volume.outline;
 
-  if (!snapshotsAffectSizes && sizeRelevantVolumes.length === 0) {
+  // no hint, the size is not affected by known criteria
+  if (!snapshotsAffectSizes && !adjustByRam && sizeRelevantVolumes.length === 0) {
     return null;
   }
 
   return (
     <>
-      {/* TRANSLATORS: header for a list of items */}
+      {/* TRANSLATORS: header for a list of items referring to size limits for file systems */}
       {_("These limits are affected by:")}
       <List>
         {snapshotsAffectSizes &&
@@ -65,6 +65,10 @@ const AutoCalculatedHint = (volume) => {
           // TRANSLATORS: list item, this affects the computed partition size limits
           // %s is replaced by a list of the volumes (like "/home, /boot")
           <ListItem>{sprintf(_("Presence of other volumes (%s)"), sizeRelevantVolumes.join(", "))}</ListItem>}
+        {adjustByRam &&
+          // TRANSLATORS: list item, describes a factor that affects the computed size of a
+          // file system; eg. adjusting the size of the swap
+          <ListItem>{_("The amount of RAM in the system")}</ListItem>}
       </List>
     </>
   );

web/src/components/storage/VolumeForm.jsx

@@ -310,6 +310,10 @@ const SizeAuto = ({ volume }) => {
       // TRANSLATORS: conjunction for merging two list items
                             volume.outline.sizeRelevantVolumes.join(_(", "))));
 
+  if (volume.outline.adjustByRam)
+    // TRANSLATORS: item which affects the final computed partition size
+    conditions.push(_("the amount of RAM in the system"));
+
   // TRANSLATORS: the %s is replaced by the items which affect the computed size
   const conditionsText = sprintf(_("The final size depends on %s."),
     // TRANSLATORS: conjunction for merging two texts