Fix incompatibility with newer util-linux lsblk output (Amazon Linux 2023)

Author: thenickdude

lib/filesystem-tools.js

@@ -147,72 +147,82 @@ module.exports.listBlockDevices = function() {
 		child_process.execFile("lsblk", ["--bytes", "--pairs", "--output", columns], function (error, stdout, stderr) {
 			if (error) {
 				reject("Failed to lsblk " + stdout + " " + stderr);
-			} else {
+				return;
+			}
+
+			let
+				devices = [];
+
+			for (let line of stdout.split("\n")) {
 				let
-					devices = [];
-				
-				for (let line of stdout.split("\n")) {
+					parameters = line.match(/(^|\s)[A-Z-_]+="[^"\n]*"/g);
+
+				if (parameters) {
 					let
-						parameters = line.match(/(^|\s)[A-Z-]+="[^"\n]*"/g);
-					
-					if (parameters) {
+						device = {};
+
+					for (let parameter of parameters) {
 						let
-							device = {};
-						
-						for (let parameter of parameters) {
-							let
-								matches = parameter.match(/^\s*([A-Z-]+)="([^"\n]*)"$/);
-							
-							device[matches[1]] = matches[2];
-						}
-						
-						/* If the parent device's name is the prefix of ours, use our suffix as the short name of
-						 * this partition
-						 */
-						if (supportsPKNAME) {
-							if (device.PKNAME.length > 0 && device.NAME.indexOf(device.PKNAME) === 0) {
-								device.PARTNAME = device.NAME.substring(device.PKNAME.length);
-							} else if (device.TYPE === "disk") {
-								device.PARTNAME = "";
-							} else {
-								device.PARTNAME = device.NAME;
-							}
+							matches = parameter.match(/^\s*([A-Z-_]+)="([^"\n]*)"$/);
+
+						device[matches[1]] = matches[2];
+					}
+
+					/* If the parent device's name is the prefix of ours, use our suffix as the short name of
+					 * this partition
+					 */
+					if (supportsPKNAME) {
+						if (device.PKNAME.length > 0 && device.NAME.indexOf(device.PKNAME) === 0) {
+							device.PARTNAME = device.NAME.substring(device.PKNAME.length);
+						} else if (device.TYPE === "disk") {
+							device.PARTNAME = "";
+						} else {
+							device.PARTNAME = device.NAME;
 						}
-						
-						device.DEVICEPATH = "/dev/" + device.NAME;
-						device.SIZE = parseInt(device.SIZE);
-						device["LOG-SEC"] = parseInt(device["LOG-SEC"]);
-						device["PHY-SEC"] = parseInt(device["PHY-SEC"]);
-						
-						devices.push(device);
 					}
+
+					device.DEVICEPATH = "/dev/" + device.NAME;
+					device.SIZE = parseInt(device.SIZE, 10);
+
+					/* lsblk has started renaming these columns to use an underscore, so grab
+					 * the values from the new location if so:
+					 * https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/1961542
+					 */
+
+					device["LOG-SEC"] = parseInt(device["LOG_SEC"] || device["LOG-SEC"], 10);
+					device["PHY-SEC"] = parseInt(device["PHY_SEC"] || device["PHY-SEC"], 10);
+
+					delete device["LOG_SEC"];
+					delete device["PHY_SEC"];
+
+					devices.push(device);
 				}
-				
-				if (!supportsPKNAME) {
-					for (let device of devices) {
-						// We could synthesize a PKNAME from our best-guess, but it's probably better not to:
-						device.PKNAME = "";
-						// Fall back to just using the name of the device if we can't come up with anything shorter
-						device.PARTNAME = device.NAME;
-						
-						switch (device.TYPE) {
-							case "part":
-								let
-									parentDisk = devices.find(parent => parent.TYPE === "disk" && device.NAME.indexOf(parent.NAME) === 0);
-								
-								if (parentDisk) {
-									device.PARTNAME = device.NAME.substring(parentDisk.NAME.length);
-								}
-								break;
-							case "disk":
-								device.PARTNAME = "";
-								break;
-						}
+			}
+
+			if (!supportsPKNAME) {
+				for (let device of devices) {
+					// We could synthesize a PKNAME from our best-guess, but it's probably better not to:
+					device.PKNAME = "";
+					// Fall back to just using the name of the device if we can't come up with anything shorter
+					device.PARTNAME = device.NAME;
+
+					switch (device.TYPE) {
+						case "part":
+							let
+								parentDisk = devices.find(parent => parent.TYPE === "disk" && device.NAME.indexOf(parent.NAME) === 0);
+
+							if (parentDisk) {
+								device.PARTNAME = device.NAME.substring(parentDisk.NAME.length);
+							}
+							break;
+						case "disk":
+							device.PARTNAME = "";
+							break;
 					}
 				}
-				
-				resolve(devices);
 			}
+
+			resolve(devices);
 		});
 	})));
 };

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "snap-to-s3",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Upload EBS snapshots to Amazon S3",
   "repository": {
     "type": "git",