Option for trimming ext partitions on raw images

Changelog-entry: Option for trimming ext partitions on raw images
Change-type: patch

lib/gui/app/models/settings.js

@@ -37,6 +37,7 @@ const DEFAULT_SETTINGS = {
   errorReporting: true,
   unmountOnSuccess: true,
   validateWriteOnSuccess: true,
+  trim: false,
   updatesEnabled: packageJSON.updates.enabled && !_.includes([ 'rpm', 'deb' ], packageJSON.packageType),
   lastSleptUpdateNotifier: null,
   lastSleptUpdateNotifierVersion: null,

lib/gui/app/modules/image-writer.js

@@ -172,7 +172,8 @@ exports.performWrite = (image, drives, onProgress) => {
       uuid: flashState.getFlashUuid(),
       flashInstanceUuid: flashState.getFlashUuid(),
       unmountOnSuccess: settings.get('unmountOnSuccess'),
-      validateWriteOnSuccess: settings.get('validateWriteOnSuccess')
+      validateWriteOnSuccess: settings.get('validateWriteOnSuccess'),
+      trim: settings.get('trim')
     }
 
     ipc.server.on('fail', ({ device, error }) => {
@@ -200,6 +201,7 @@ exports.performWrite = (image, drives, onProgress) => {
         imagePath: image,
         destinations: drives,
         validateWriteOnSuccess: settings.get('validateWriteOnSuccess'),
+        trim: settings.get('trim'),
         unmountOnSuccess: settings.get('unmountOnSuccess')
       })
     })
@@ -312,6 +314,7 @@ exports.flash = (image, drives) => {
     flashInstanceUuid: flashState.getFlashUuid(),
     unmountOnSuccess: settings.get('unmountOnSuccess'),
     validateWriteOnSuccess: settings.get('validateWriteOnSuccess'),
+    trim: settings.get('trim'),
     applicationSessionUuid: store.getState().toJS().applicationSessionUuid,
     flashingWorkflowUuid: store.getState().toJS().flashingWorkflowUuid
   }
@@ -375,6 +378,7 @@ exports.cancel = () => {
     flashInstanceUuid: flashState.getFlashUuid(),
     unmountOnSuccess: settings.get('unmountOnSuccess'),
     validateWriteOnSuccess: settings.get('validateWriteOnSuccess'),
+    trim: settings.get('trim'),
     applicationSessionUuid: store.getState().toJS().applicationSessionUuid,
     flashingWorkflowUuid: store.getState().toJS().flashingWorkflowUuid,
     status: 'cancel'

lib/gui/app/pages/settings/templates/settings.tpl.html

@@ -43,6 +43,17 @@
     </label>
   </div>
 
+  <div class="checkbox">
+    <label>
+      <input type="checkbox"
+        tabindex="8"
+        ng-model="settings.currentData.trim"
+        ng-change="settings.toggle('trim')">
+
+      <span>Trim ext{2,3,4} partitions before writing (raw images only)</span>
+    </label>
+  </div>
+
   <div class="checkbox">
     <label>
       <input type="checkbox"

lib/gui/modules/child-writer.js

@@ -93,6 +93,7 @@ const handleError = async (error) => {
  * @param {SourceDestination} source - source
  * @param {SourceDestination[]} destinations - destinations
  * @param {Boolean} verify - whether to validate the writes or not
+ * @param {Boolean} trim - whether to trim ext partitions before writing
  * @param {Function} onProgress - function to call on progress
  * @param {Function} onFail - function to call on fail
  * @returns {Promise<{ bytesWritten, devices, errors} >}
@@ -100,8 +101,17 @@ const handleError = async (error) => {
  * @example
  * writeAndValidate(source, destinations, verify, onProgress, onFail, onFinish, onError)
  */
-const writeAndValidate = async (source, destinations, verify, onProgress, onFail) => {
-  const innerSource = await source.getInnerSource()
+const writeAndValidate = async (source, destinations, verify, trim, onProgress, onFail) => {
+  let innerSource = await source.getInnerSource()
+  if (trim && (await innerSource.canRead())) {
+    innerSource = new sdk.sourceDestination.ConfiguredSource(
+      innerSource,
+      trim,
+
+      // Create stream from file-disk (not source stream)
+      true
+    )
+  }
   const { failures, bytesWritten } = await sdk.multiWrite.pipeSourceToDestinations(
     innerSource,
     destinations,
@@ -197,6 +207,7 @@ ipc.connectTo(IPC_SERVER_ID, () => {
     log(`Devices: ${destinations.join(', ')}`)
     log(`Umount on success: ${options.unmountOnSuccess}`)
     log(`Validate on success: ${options.validateWriteOnSuccess}`)
+    log(`Trim: ${options.trim}`)
     const dests = _.map(options.destinations, (destination) => {
       return new sdk.sourceDestination.BlockDevice(destination, options.unmountOnSuccess)
     })
@@ -206,6 +217,7 @@ ipc.connectTo(IPC_SERVER_ID, () => {
         source,
         dests,
         options.validateWriteOnSuccess,
+        options.trim,
         onProgress,
         onFail
       )