From f2ca997195ca71764085bc359abd4c4cc6e12d0f Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Tue, 11 Dec 2018 13:27:42 +0100 Subject: [PATCH 1/2] Change "Drive Contains Image" label. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use "Drive Mountpoint Contains Image" instead as the image may not be on this drive but on a drive mounted in one of the mountpoins of this drive. We still don't want to allow flashing this drive in that situation. Changelog-entry: Changed “Drive Contains Image” to “Drive Mountpoint Contains Image” Change-type: patch --- lib/shared/messages.js | 2 +- scripts/resin | 2 +- tests/shared/drive-constraints.spec.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/shared/messages.js b/lib/shared/messages.js index 9d800d38..a62a5464 100644 --- a/lib/shared/messages.js +++ b/lib/shared/messages.js @@ -97,7 +97,7 @@ module.exports = { }, containsImage () { - return 'Drive Contains Image' + return 'Drive Mountpoint Contains Image' }, // The drive is large and therefore likely not a medium you want to write to. diff --git a/scripts/resin b/scripts/resin index 8baa9e9a..6077afee 160000 --- a/scripts/resin +++ b/scripts/resin @@ -1 +1 @@ -Subproject commit 8baa9e9a4063edc0b597baf16e266e28ed460b94 +Subproject commit 6077afeee039b2ff9eab5e217ea35c79428881bc diff --git a/tests/shared/drive-constraints.spec.js b/tests/shared/drive-constraints.spec.js index 433ff9ca..87c4eb81 100644 --- a/tests/shared/drive-constraints.spec.js +++ b/tests/shared/drive-constraints.spec.js @@ -1322,7 +1322,7 @@ describe('Shared: DriveConstraints', function () { it('should return contains image error', function () { m.chai.expect(constraints.getListDriveImageCompatibilityStatuses([ drives[0] ], image)).to.deep.equal([ { - message: 'Drive Contains Image', + message: 'Drive Mountpoint Contains Image', type: 2 } ]) @@ -1378,7 +1378,7 @@ describe('Shared: DriveConstraints', function () { it('should return all statuses', function () { m.chai.expect(constraints.getListDriveImageCompatibilityStatuses(drives, image)).to.deep.equal([ { - message: 'Drive Contains Image', + message: 'Drive Mountpoint Contains Image', type: 2 }, { From 2dc4fef4d3c7a71ca66dc4c9be93f0ff12157469 Mon Sep 17 00:00:00 2001 From: Lorenzo Alberto Maria Ambrosi Date: Mon, 7 Jan 2019 15:38:11 +0100 Subject: [PATCH 2/2] Update scripts to build on other Linux distros Change-type: patch Signed-off-by: Lorenzo Alberto Maria Ambrosi --- scripts/resin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/resin b/scripts/resin index 6077afee..5961434e 160000 --- a/scripts/resin +++ b/scripts/resin @@ -1 +1 @@ -Subproject commit 6077afeee039b2ff9eab5e217ea35c79428881bc +Subproject commit 5961434ebe3e24df23110333abffcbe02a69be49